Fix RVM due to bad merge