Commit to create a new Conflict in merge