second branch commit
cause conflict
conflict
fixed merge conflicts
branch one
puppies branch two
branch 3
merged 1 and 2
merged all 3
first commit