fetches feature-branch-remote;
creates new file with contents
create new commit-remote while in master;
introduce conflict
fix conflict