recover the auto-rename merge
recover the auto-rename merge

jamesmarva/myria,jamesmarva/myria,uwescience/myria,bsalimi/myria,uwescience/myria,bsalimi/myria,uwescience/myria,bsalimi/myria,jamesmarva/myria