And simple
& simple
Merge branch 'feature1'

Conflicts:
	readmee.txt
modify
infobranch
change #
merge with no-ff
append A
append 1
append b
conflicts fixed
add two file to bbranch
add two file to abranch
merge abranch and bbranch to master
add a file to abranch
add a file to b branch
Merge branches 'abranch' and 'bbranch'