Fix merging conflict resolution mistakes

Author: ProGamerGov

captum/optim/_utils/circuits.py

@@ -30,8 +30,8 @@ def extract_expanded_weights(
             specified for target2.
         target2 (nn.Module):  The end target layer. Must be above the layer
             specified for target1.
-        crop_shape (int or tuple of ints, optional):  Specify the exact output size
-            to crop out.
+        crop_shape (int or tuple of ints, optional):  Specify the output weight
+            size to enter crop away padding.
         model_input (tensor or tuple of tensors, optional):  The input to use
             with the specified model.
         crop_func (Callable, optional):  Specify a function to crop away the padding