commit-remote.txt file
introduce conflict
Merge branch 'feature-branch-remote'
after conflict
Conflicts:
	commit-remote.txt