add chruby other stuff
fix conflicts