shallow initial impl of rename. #232
handling conflicts