branch test
AND simple
&simple
modified and to &
modified and to &
add last
AND simple
& simple
conflict fixed
new branch modified
add merge
add +
changed at 00:51