remove target files
fix conflict