Remove more erroneously committed conflict markers