Adding commit-remote.txt
Commiting potential conflict in commit-remote.txt
Merge branch 'feature-branch-remote'
"commiting changes to remote.txt on master branch"

Conflicts:
	commit-remote.txt