Removed the conflicted project file