commit in version 2
another commit
commit in versrion 2
commit in master
merging