rename project
fix merge error