fixing some rbenv stuff
fix merge conflicts