FIX: resolve merge conflict and final linting

Author: athishdresu

mne/stats/cluster_level.py

@@ -911,8 +911,8 @@ def _permutation_cluster_test(
     is elicited.
     Note: By default, the minimum number of
     neighboring points (e.g., channels)
-    required to form a cluster is 0. This means a
-    single significant point can technically
+    required to form a cluster is 0. This means
+    a single significant point can technically
     constitute a cluster.
     """
     _check_option("out_type", out_type, ["mask", "indices"])