diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py
index 9db01f1388..5bb6a9f7e7 100644
--- a/lib/ansible/inventory/__init__.py
+++ b/lib/ansible/inventory/__init__.py
@@ -533,12 +533,16 @@ class Inventory(object):
         if subset_pattern is None:
             self._subset = None
         else:
+<<<<<<< HEAD
 <<<<<<< HEAD
             subset_patterns = self._split_pattern(subset_pattern)
 =======
             subset_pattern = subset_pattern.replace(',',':')
             subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
 >>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern
+=======
+            subset_patterns = self._split_pattern(subset_pattern)
+>>>>>>> Don't accept undocumented "p1;p2" patterns; note in changelog
             results = []
             # allow Unix style @filename data
             for x in subset_patterns: