commit remote.txt from feature-branch-remote
commit-remote from master
resolved conflict in commit-remote w. master version
commit-3 in master