resolve conflicts

Author: samuel.oranyeli

janitor/functions/conditional_join.py

@@ -5,7 +5,6 @@
 import pandas as pd
 import pandas_flavor as pf
 from pandas.core.dtypes.common import (
-    is_categorical_dtype,
     is_datetime64_dtype,
     is_dtype_equal,
     is_extension_array_dtype,
@@ -336,29 +335,27 @@ def _conditional_join_type_check(
             "when use_numba is set to True"
         )
 
-    permitted_types = {
-        is_datetime64_dtype,
-        is_numeric_dtype,
-        is_string_dtype,
-    }
-    for func in permitted_types:
-        # change is based on this PR
-        # https://github.com/pandas-dev/pandas/pull/52527/files
-        if isinstance(left_column.dtype, pd.CategoricalDtype) or func(
-            left_column
-        ):
-            break
-    else:
-        raise TypeError(
-            "conditional_join only supports "
-            "string, category, numeric, or date dtypes (without timezone) - "
-            f"'{left_column.name} is of type {left_column.dtype}."
-        )
+    is_categorical_dtype = isinstance(left_column.dtype, pd.CategoricalDtype)
 
-    lk_is_cat = is_categorical_dtype(left_column)
-    rk_is_cat = is_categorical_dtype(right_column)
+    if not is_categorical_dtype:
+        permitted_types = {
+            is_datetime64_dtype,
+            is_numeric_dtype,
+            is_string_dtype,
+        }
+        for func in permitted_types:
+            if func(left_column.dtype):
+                break
+        else:
+            raise TypeError(
+                "conditional_join only supports "
+                "string, category, numeric, or "
+                "date dtypes (without timezone) - "
+                f"'{left_column.name} is of type "
+                f"{left_column.dtype}."
+            )
 
-    if lk_is_cat & rk_is_cat:
+    if is_categorical_dtype:
         if not left_column.array._categories_match_up_to_permutation(
             right_column.array
         ):