new line appended
Commit on dev
commit on feature1
commit on master
commit after resolving conflict
commit 2 on feature1
commit 2 on master
commit after resolving conflict