Fix conflicts and then commit the result