initial commit in my project
made a change
made other change
hotfix commit
hotfix deleted
testing kaka
integrate
testing test
integrate testing
testing again
testing conflict
testing conflict2