Added Conflict.txt

Added Conflict.txt