Fixed merge conflicts
Removed a file from prev project