first commit of commit-remote
conflict resolution