solve merge conflict
delete unused files