write a readme file
edit file
&simple
conflict fixed
add create
merge with no-off