diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 8c0f0b336..fe84a94b7 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -230,11 +230,6 @@ void amiga_bitmap_destroy(void *bitmap)
 			ami_memory_clear_free(bm->pixdata);
 		}
 
-<<<<<<< HEAD
-=======
-		if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
-
->>>>>>> Fix merge error
 		if(bm->url) nsurl_unref(bm->url);
 		if(bm->title) free(bm->title);