project file didn't merge correctly. hopefully now fixed.