diff --git a/Assets/board.cs b/Assets/board.cs
index f90c097..61cdf08 100644
--- a/Assets/board.cs
+++ b/Assets/board.cs
@@ -1,7 +1,10 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+<<<<<<< HEAD
 using static properties;
+=======
+>>>>>>> cf686d8cd1e8be24b600a6d66e72755a749da53b
 
 public class board : MonoBehaviour
 {
@@ -10,8 +13,12 @@ public class board : MonoBehaviour
     {
         public int houses; //Initialising houses
         public int hotels; //Initialising hotels
+<<<<<<< HEAD
         // List<properties.Property> cards = new List<properties.Property>;
         Property cards = new Property("test", "test", 200, 400);
+=======
+        List<Property> cards = new List<Property>();
+>>>>>>> cf686d8cd1e8be24b600a6d66e72755a749da53b
 
         public Board()
         {
@@ -20,6 +27,8 @@ public class board : MonoBehaviour
         }
 
 
+
+
     }
 
     // Start is called before the first frame update