Adding the entire project
Resolving the Merge problems...