dev branch 1 commit
dev branch 2 commit
master branch 4 commit
conflict fixed