commit-remote.txt
add commit-remote
fix merge conflict