diff --git a/fourcell/normalize.py b/fourcell/normalize.py
index 778644a..2517c7a 100644
--- a/fourcell/normalize.py
+++ b/fourcell/normalize.py
@@ -398,4 +398,8 @@ cv2.rectangle(blank, offset, (offset[0]+meanRect[0], offset[1]+meanRect[1]), (25
 
 #normal = place(blank, rotated, 0, 0)
 
+<<<<<<< Updated upstream
 
+=======
+display(blank)
+>>>>>>> Stashed changes