Fix gitmerge handling of automatic conflict reslution