fix merge conflict project.html