fix missed merge conflict in rbenv
line up assets and such