removed merge comflicts in the Gemfile.lock