repaired merger conflict

ledmatrix.py

@@ -76,7 +76,7 @@ class LedMatrix:
 		# one step to the east, and then south to north, before thxy	e cycle
 		# starts over.
 		stride = self.stride
-		phys_addr =  ((x)%self.panelcolumn) + ((y)*self.panelcolumn) + (self.round_down((x)/self.panelcolumn) * self.panelcolumn * self.panelcolumn)
+		phys_addr = int(((x)%self.panelcolumn) + ((y)*self.panelcolumn) + (self.round_down((x)/self.panelcolumn) * self.panelcolumn * self.panelcolumn))
 
 		# if x & 1:
 		# 	phys_addr += stride - 1 - y