this is a commit message
master remote
Merge branch 'feature-branch-remote'

Conflicts:
	commit-remote.txt