AND simple
a new line
solve conflict
add merge
merge with no-ff