add a branch, branch test
using symbol &
using AND
conflit resolved, changed to 'and'
play with brach merger no-ff
see line 7, branch didnt show up with fast forward
merge with no-ff