add new branch file
changed in branch2
add in master
add and rename in branch2
add and rename in branch2
merge from branch2 finished