diff --git a/bundle.json b/bundle.json
index 890fed5..20f040c 100644
--- a/bundle.json
+++ b/bundle.json
@@ -74,7 +74,9 @@
               "detail_enhancer_common.h",
               "detail_enhancer_image.h",
               "detail_enhancer_video_common.h",
-              "detail_enhancer_video.h"
+              "detail_enhancer_video.h",
+              "contrast_enhancer_common.h",
+              "contrast_enhancer_image.h"
             ],
             "header_base": "//foundation/multimedia/video_processing_engine/interfaces/inner_api"
           }
diff --git a/interfaces/inner_api/contrast_enhancer_image.h b/interfaces/inner_api/contrast_enhancer_image.h
index eef0f6d..fb7a0e2 100644
--- a/interfaces/inner_api/contrast_enhancer_image.h
+++ b/interfaces/inner_api/contrast_enhancer_image.h
@@ -112,11 +112,7 @@ public:
      * @return 返回错误码 VPEAlgoErrCode
      * @since 16
      */
-<<<<<<< HEAD
      virtual VPEAlgoErrCode ComposeFOVImage(OHOS::Rect displayArea, sptr<SurfaceBuffer> oriBuffer,
-=======
-     virtual VPEAlgoErrCode ComposeFOVImage()(OHOS::Rect displayArea, sptr<SurfaceBuffer> oriBuffer,
->>>>>>> dc0ab2d59bfaf53af4f8f9a04d70c420c722297e
         sptr<SurfaceBuffer> lhdrBuffer, sptr<SurfaceBuffer> outBuffer, ContrastEnhancerInfo info) = 0;
 protected:
     ContrastEnhancerImage() = default;