commit-remote in feature-branch-remote
commit-remote in master
Merge branch 'feature-branch-remote'

Conflicts:
	commit-remote.txt