remove ugly merge lines