more progress on merge/rename