diff --git a/app/src/main/java/model/ArrayGrid.java b/app/src/main/java/model/ArrayGrid.java
index 29f17ec012347f53c118ba96083ef59decd8249d..3fd9a6b30fdc72e936359606087e74c4721a0296 100644
--- a/app/src/main/java/model/ArrayGrid.java
+++ b/app/src/main/java/model/ArrayGrid.java
@@ -1,7 +1,10 @@
 package model;
 
+<<<<<<< HEAD
 import java.util.Iterator;
 
+=======
+>>>>>>> origin/main
 public class ArrayGrid implements Grid{
 
     private Cell [][] cells;
@@ -43,6 +46,7 @@ public class ArrayGrid implements Grid{
     public int getNumberOfColumns() {
         return 0;
     }
+<<<<<<< HEAD
 
     @Override
     public void color(ColorGenerator colorGenerator) {
@@ -54,4 +58,6 @@ public class ArrayGrid implements Grid{
     }
 
 
+=======
+>>>>>>> origin/main
 }