Created commit-remote.txt
Created commit-remote.txt in master
Resolved conflict