change readme.txt
add word- I want to make a conflict
create conflictgit add .
solve conflict success