added conflict.txt
Merge pull request #3 from bsan/troloTOPIC

added conflict.txt