branch_dev test
add //create a new branch is quick and simple in branch feature1
add //in simple in master
confict fixed