commit remote.txt
add commit-remote.txt in master
Fix conflict and commit