modify readme.txt in dev vranch
append AND simple in feature1
append & simple in master
conflict fixed
add merge
merge with no-ff
learn stash 1