create a new branch
add feature1 branch
& test
merge freature1 branch
confilict fixed