BUG: (pandas-dev#34074) Added test and documentation

Author: CuylenE

pandas/tests/indexes/multi/test_join.py

@@ -104,7 +104,10 @@ def test_join_multi_wrong_order():
     assert lidx is None
     tm.assert_numpy_array_equal(ridx, exp_ridx)
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> BUG: (#34074) Added test and documentation
 def test_join_multi_return_indexers():
     # GH 34074