added commit-remote.txt in remote branch
changed text in commit-remote.txt
resolve conflict in two branches (commit-remote.txt)