conditional logic in project controller show action to prevent action breaking when commits have no author
resolve conflicts