Project Initialized
fixed merges
Fixing merge issues