Remove left-over merge conflict markers