diff --git a/cmd/scale/griddownscale.go b/cmd/scale/griddownscale.go
index 1fce0ae..27835dc 100644
--- a/cmd/scale/griddownscale.go
+++ b/cmd/scale/griddownscale.go
@@ -1,14 +1,11 @@
-package main
+packagemain
 
 import (
 	"flag"
 	"image"
 
-<<<<<<< HEAD
 	"git.nkpl.cc/twocookedfaggots/imageutils/pkg/downscale"
-=======
 	"git.nkpl.cc/twocookedfaggots/imageutils/downscale"
->>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 	"git.nkpl.cc/twocookedfaggots/imageutils/util"
 )
 
diff --git a/pkg/downscale/grid.go b/pkg/downscale/grid.go
index ba1df02..4deab89 100644
--- a/pkg/downscale/grid.go
+++ b/pkg/downscale/grid.go
@@ -1,13 +1,10 @@
 package downscale
 
-<<<<<<< HEAD
 import (
 	"image"
 	"image/color"
 )
 
-=======
->>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 type sub struct {
 	image.Image
 	image.Rectangle