merging commit
merging commit 2
final merge commit