added conflict.txt to test merge conflict
added more stuff to conflict.txt