unused files removed
fixed merge conflicts