Remove git conflict-marked areas