delete useless files
fix merge