add commit-remote.txt
commit in master
resolve conflict