fixin merge conflict in project controller