add branch dev
dev
add new branch
branch feature1
master branch
merge conflict