changed gemfile for paper trail gem
gemfile.lock conflict