merge new feature
delete unused files