branch test
conflict test
feature1 AND simple
master & simple
conflict fixed
another branch test
real test for another branch dev
reall merge with --no-ff option for branch dev