Adding commit-remote.txt
Adding commit-remote.txt on master
Resolving commit-remote.txt conflict