Fixing gemfile merge conflicts