rephrase sentense
fix merge conflict