master great file
great file
solve conflict in greatfile.txt