B
C
D
update gittest.txt in branch feature1
add 1 in branch feature1
add simple in master
merge master and feature1