removed merge conflicts from gemfile.lock