AND simple
conflict fixed
add merge
merge with no-ff
try git stash and edit file1.txt on branch dev
merged bug fix on branch dev
git stash pop and commit