fix a bug,and delete some files
fix conflict