Remove merge conflict remnants.