this is new branch test
dev add
bee branch
change master
conflict fixed
add branch
merge with no-ff
aa.tt modify
merged bug
aa
Merge branch 'bb'

Conflicts:
	aa.tt
add