AND simple:feature1
and simple:master
Conflict fixed
Forbid fast forword
merge with no-ff