rvm setup
resolve merge