rebase step 1

pygsti/circuits/circuit.py

@@ -3537,7 +3537,7 @@ def cnt(obj):  # obj is either a simple label or a list
                     return sum([cnt(sub) for sub in obj])
 
         return sum([cnt(layer_lbl) for layer_lbl in self._labels])
-
+    
     def _togrid(self, identity_name):
         """ return a list-of-lists rep? """
         d = self.num_layers