Fix poorly resolved conflict