Commit-remote in feature branch remote
Commit remote in master
Fix conflict
Fix conflict again
Commit 3