add commit-remote
add commit-remote
conflict resolve