Unresolved entry rename

further work on merge WIP