added conflict2.txt