Remove Gemfile merge cruft