Fix conflicts format