jselig-rigetti
diff --git a/‎cirq-core/cirq/json_resolver_cache.py
-1 b/‎cirq-core/cirq/json_resolver_cache.py
-1
diff --git a/‎cirq-core/cirq/protocols/json_test_data/MSGate.json
-4 b/‎cirq-core/cirq/protocols/json_test_data/MSGate.json
-4
diff --git a/‎cirq-core/cirq/protocols/json_test_data/MSGate.repr
-1 b/‎cirq-core/cirq/protocols/json_test_data/MSGate.repr
-1
diff --git a/‎cirq-core/cirq/protocols/json_test_data/spec.py
+1 b/‎cirq-core/cirq/protocols/json_test_data/spec.py
+1
@@ -157,7 +157,6 @@ def _symmetricalqidpair(qids):
         'LineTopology': cirq.LineTopology,
         'Linspace': cirq.Linspace,
         'ListSweep': cirq.ListSweep,
-        'MSGate': cirq.MSGate,
         'MatrixGate': cirq.MatrixGate,
         'MixedUnitaryChannel': cirq.MixedUnitaryChannel,
         'MeasurementKey': cirq.MeasurementKey,
 
@@ -39,6 +39,7 @@
         'KakDecomposition',
         'LinearCombinationOfGates',
         'LinearCombinationOfOperations',
+        'MSGate',  # namespace conflict with `cirq_ionq.ionq_native_gates.MSGate`
         'PauliSumCollector',
         'PauliSumExponential',
         'PeriodicValue',