change text file
fix merge conflicts
fix merge