when a page falls in conflict, commit the conflictive content to leave the repo clean
newer versions of git don't leave a blank line at the end