first commit-remote
resolving conflicts