Merge Gemfile changes properly