Frameworks: fix merge errors