remove merge conflict remnants