branch test...
add new line in feature1
ADD NEW LINE IN MASTER.
conflict fixed.
add newline aaa in feature1
add new line bbb in feature1
conflict fixed 2
add line ccc to branch dev
add line ddd to branch dev.
add new line eee to branch dev\!\!\!
merge with no-ff