Resolved conflict in newProject.html