branch test
AND simle
&simle
conflict fixed
add merge
merge with no-ff
add README.md file
Merge branch 'dev'
add content to readme.txt
Revert "add content to readme.txt"

This reverts commit c5ebb8fee21a68730c72ef4ae9226e1ea5b6c936.