Commit in test-fast-forward
Commit on master
Resolve conflict for merge