Resolved Issues with the project file
Resolved Conflicts