first commit
commit one
commit two
Merge branch 'master' of github.com:buth/test
cool
resolved conflict