modified some files
fix merge