Removed problems in project file
Removed conflicts