New commit-remote.txt
Add commit-remote.txt in master
Resolve conflict. Master wins.