fixed merged conflicts in project file.  again.