Created commit.remote.txt and updated it's name to commit-remote.txt
Merge branch 'feature-branch-remote'

Removed conflict between commit-remote.txt files

Conflicts:
	commit-remote.txt