branch test add a new line to readme.txt
dev_fillix modified readme.txt
AND simple
& simple
conflict fixed
change again
feature change again
conflict fixed again