fix

frontend/src/metabase/query_builder/template_tags/TagEditorHelp.jsx

@@ -56,13 +56,8 @@ const TagExample = ({ datasetQuery, setQuery }) =>
             { setQuery && (
                 <div
                     className="Button Button--small"
-<<<<<<< HEAD
                     data-metabase-event="QueryBuilder;Template Tage Example Query Used"
-                    onClick={() => setQuery(datasetQuery, true)}
-=======
-                    data-metabase-event="QueryBuilder;Template Tag Example Query Used"
-                    onClick={ () => setQuery(datasetQuery, true) }
->>>>>>> origin/master
+                    onClick={() => setQuery(datasetQuery, true) }
                 >
                     Try it
                 </div>