Remove git conflict markers