test 6 - 1st commit - 
  pull - merge - commit
test 6 - 2nd commit
pull - merge - commit - pull - merge - commit
test 6 - commit 3
commit 4