dev modify readme.txt
AND simple
& simple
confilct fixed
conflict modify
add my_project