resolve conflicts

Author: 31puneet

malariagen_data/anoph/xpehh.py

@@ -296,6 +296,12 @@ def plot_xpehh_gwss_track(
             inline_array=inline_array,
         )
 
+        if len(x) == 0:
+            raise ValueError(
+                "No XP-EHH values remain after filtering. "
+                "Try relaxing filter_min_maf or min_ehh parameters."
+            )
+
         # determine X axis range
         x_min = x[0]
         x_max = x[-1]

malariagen_data/anopheles.py

@@ -950,6 +950,12 @@ def plot_ihs_gwss_track(
             inline_array=inline_array,
         )
 
+        if len(x) == 0:
+            raise ValueError(
+                "No iHS values remain after filtering. "
+                "Try relaxing filter_min_maf or min_ehh parameters."
+            )
+
         # determine X axis range
         x_min = x[0]
         x_max = x[-1]