more work on merge of rename and unresolved data