Eliminated merge conflicts in Gemfile.lock