commit the conflict file