removed merge conflict fragment