Fixed merge conflict, removed unused files