deleted unnecessary files
update
fix conflict