atlas operators

Author: rachel-mack

source/atlas-search.txt

@@ -21,7 +21,6 @@ Atlas Search
 Overview
 --------
 
-<<<<<<< HEAD
 In this guide, you can learn how to use the {+driver-short+} to
 run :atlas:`Atlas Search </atlas-search/>` queries on a collection.
 Atlas Search enables you to perform full-text searches on collections
@@ -106,28 +105,3 @@ the following API documentation:
 - `MongoCollection.aggregate() <{+api+}/apidocs/mongodb-driver-sync/com/mongodb/client/MongoCollection.html#aggregate(java.util.List)>`__
 - `Aggregates.search() <{+api+}/apidocs/mongodb-driver-core/com/mongodb/client/model/Aggregates.html#search(com.mongodb.client.model.search.SearchCollector)>`__
 - `Aggregates.project() <{+api+}/apidocs/mongodb-driver-core/com/mongodb/client/model/Aggregates.html#project(org.bson.conversions.Bson)>`__
-=======
-In this guide, you can learn how to use Atlas Search
-in the {+driver-short+}. For more information about Atlas Search and its
-benefits, see the :atlas:`Atlas Search </atlas-search/>` guide.
-
-Atlas Search enables advanced search functionality for your applications without any additional management or
-separate search system alongside your database. Atlas Search queries take the
-form of an :ref:`aggregation pipeline <java-aggregation>` stage.
-
-The following operators:
-  
-  - ``phrase``
-  
-  - ``regex``
-  
-  - ``queryString``
-  
-  - ``equals``
-  
-  - ``moreLikeThis``
-  
-  - ``in``
-  
-  - ``wildcard``
->>>>>>> 666e714 (atlas search operators)