Fixed issue #3700: Resolve the conflicts did not show the merge_head with correct...