dev branch 1st commit
maser branch 1st commit
master branch commit
conflic slove lst
master branch commit
hotfix bug 1st