MERGE
MERGE
Changed the project setup