Update project.php

Removing conflict error