fix conflicts

entities/items/item.py

@@ -3,6 +3,11 @@ from entities import resource as _resource
 
 class BrSimItem(_resource.BrSimResource):
 
+  # test 
+  def __init__(self):
+    self.coord_x= 0
+    self.coord_y= 0
+
   def is_item(self):
     return True