remove left-over merge markers