readme.txt
AND simple
add merge
merge with --no-f