dev branch
DBDBDBDBDB
dog
cat
conflict fixed
hellooworld
hellokitty
confict fixed
man
merge without fast forward