add merge
new branch
simple
conflict fixed
conflict fixed merged