Changed the project configurations
Fixed the conflict
Some minor changes