diff --git a/frontend/src/pages/Writer/Images.tsx b/frontend/src/pages/Writer/Images.tsx
index 9dc0916a..7a52062c 100644
--- a/frontend/src/pages/Writer/Images.tsx
+++ b/frontend/src/pages/Writer/Images.tsx
@@ -9,7 +9,6 @@ import {
   fetchContentImages,
   ContentImagesGroup,
   ContentImagesResponse,
-  generateImages,
   fetchImageGenerationSettings,
 } from '../../services/api';
 import { useToast } from '../../components/ui/toast/ToastContainer';
@@ -221,7 +220,6 @@ export default function Images() {
         return;
       }
       
-<<<<<<< HEAD
       // STAGE 1: Open modal immediately with all progress bars
       setImageQueue(queue);
       setCurrentContentId(contentId);
@@ -242,26 +240,6 @@ export default function Images() {
     } catch (error: any) {
       console.error('[Generate Images] Exception:', error);
       toast.error(`Failed to initialize image generation: ${error.message}`);
-=======
-      const result = await generateImages(imageIds);
-      if (result.success) {
-        // Show toast message (no progress modal)
-        const generated = result.images_generated || 0;
-        const failed = result.images_failed || 0;
-        if (generated > 0) {
-          toast.success(`Images generated: ${generated} image${generated !== 1 ? 's' : ''} created${failed > 0 ? `, ${failed} failed` : ''}`);
-        } else if (failed > 0) {
-          toast.error(`Image generation failed: ${failed} image${failed !== 1 ? 's' : ''} failed`);
-        } else {
-          toast.success('Image generation completed');
-        }
-        loadImages(); // Reload to show new images
-      } else {
-        toast.error(result.error || 'Failed to generate images');
-      }
-    } catch (error: any) {
-      toast.error(`Failed to generate images: ${error.message}`);
->>>>>>> parent of e89eaab0 (some changes)
     }
   }, [toast, images, buildImageQueue]);