Fix merge conflicts on projects page