Temporary fix for chruby auto not being nice
Fixes merge conflict