add branch dev
create a new branch feature
edit branch name feature1
create branch feature
and simple
conflict fixed