trying to fix terrible git merge of project file