Created conflict.txt
Fixed merge conflicts.