Add commit-remote
Add commit-remote in merge
Resolve merge conflict