Basic feature
Remote commit
Master commit conflict
Merge branch 'feature-branch-remote'

Conflicts:
	commit-remote.txt