Fix regression in merge conflict resolution
Fix regression in merge conflict resolution

See https://github.com/saltstack/salt/commit/a781a0d0d16ac1fda9f7c4f70d525a5db8bb4455#commitcomment-21715967

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt