FIXUP: inner merges