merging
publications index
application_helper.rb
resolved conflicts
more merge conflicts in schema resolved