diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js
index 4bcad05b89..7700bdcd1d 100644
--- a/awx/ui/client/src/helpers/Jobs.js
+++ b/awx/ui/client/src/helpers/Jobs.js
@@ -366,12 +366,7 @@ export default
                 mode: 'edit',
                 id: id,
                 scope: scope,
-<<<<<<< HEAD
-                showSearch: false
-=======
-                showSearch: true,
                 title: false
->>>>>>> tagSearchUI
             });
 
             SearchInit({