frameworks: fix merge conflict error