missed a merge line in project.py