diff --git a/src/components/auto-image/single-image.tsx b/src/components/auto-image/single-image.tsx
index 9e50bb31..183e4526 100644
--- a/src/components/auto-image/single-image.tsx
+++ b/src/components/auto-image/single-image.tsx
@@ -78,11 +78,7 @@ const SingleImage: React.FC<SingleImageProps> = (props) => {
             background: `url(${dataUrl}) center center / cover no-repeat`
           }}
         ></div>
-<<<<<<< HEAD
-      )}
-=======
-      )} */}
->>>>>>> 2c31c4a (fix: jump to playground from model list)
+       */}
       <span
         className="thumb-img"
         style={{