add commit-remote
add commit-remote
fixed conflict in commit-remote