removed project && project.bak
removed dumb files and merged