diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts
index b79a49c5269053873119a6ccf9667c0264760baa..e865bdda909d5cfb782be596ebe9a5b8ab9afe21 100644
--- a/api/@ohos.window.d.ts
+++ b/api/@ohos.window.d.ts
@@ -2977,6 +2977,7 @@ declare namespace window {
    * @atomicservice
    * @since 12
    */
+<<<<<<< Updated upstream
   /**
    * Creates a child window or system window. This API uses an asynchronous callback to return the result.
    *
@@ -2996,6 +2997,8 @@ declare namespace window {
    * @atomicservice
    * @since 17
    */
+=======
+>>>>>>> Stashed changes
   export function createWindow(config: Configuration, callback: AsyncCallback<Window>): void;
 
   /**
@@ -3034,6 +3037,7 @@ declare namespace window {
    * @atomicservice
    * @since 12
    */
+<<<<<<< Updated upstream
   /**
    * Create a window with a specific configuration
    * When config.windowType == TYPE_FLOAT, the "ohos.permission.SYSTEM_FLOAT_WINDOW" permission is required
@@ -3054,6 +3058,8 @@ declare namespace window {
    * @atomicservice
    * @since 17
    */
+=======
+>>>>>>> Stashed changes
   export function createWindow(config: Configuration): Promise<Window>;
 
   /**