removing git conflict markers