branch test
AND simple
&simple
conflict fixed
fix bug
merge bug fix
fixed bug
going to merge file before fixing and fixed