Remove left-over merge markers