solve conflict in greatfile.txt