Created conflict.txt