diff --git a/dvc/command/data_sync.py b/dvc/command/data_sync.py
index ef7d5b1f0..6a9d4e89a 100644
--- a/dvc/command/data_sync.py
+++ b/dvc/command/data_sync.py
@@ -113,11 +113,7 @@ def shared_parent_parser():
         help="Show checksums instead of file names.",
     )
     shared_parent_parser.add_argument(
-<<<<<<< HEAD
         "targets", nargs="*", default=None, help="Limit the scope to these stage files."
-=======
-        "targets", nargs="*", default=None, help="DVC-files."
->>>>>>> upstream/master
     )
 
     return shared_parent_parser