Create branch
merge
merge master
Conflick