Frameworks: fix merge derps