fix app_window merge