diff --git a/cmd/scale/griddownscale.go b/cmd/scale/griddownscale.go
index f1c3618..1fce0ae 100644
--- a/cmd/scale/griddownscale.go
+++ b/cmd/scale/griddownscale.go
@@ -4,7 +4,11 @@ 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 4deab89..ba1df02 100644
--- a/pkg/downscale/grid.go
+++ b/pkg/downscale/grid.go
@@ -1,10 +1,13 @@
 package downscale
 
+<<<<<<< HEAD
 import (
 	"image"
 	"image/color"
 )
 
+=======
+>>>>>>> b75a8814a2a6c09fa4f0fa615e7b376e64e983ec
 type sub struct {
 	image.Image
 	image.Rectangle