post merge fixup