Update file.

Author: MikeRayMSFT

docs/relational-databases/performance/joins.md

@@ -257,11 +257,7 @@ A few conditions make a logical join eligible for a batch mode Adaptive Join:
 - The database compatibility level is 140 or higher.
 - The query is a `SELECT` statement (data modification statements are currently ineligible).
 - The join is eligible to be executed both by an indexed Nested Loops join or a Hash join physical algorithm.
-<<<<<<< HEAD
-- The Hash join uses Batch mode, enabled through the presence of a Columnstore index in the query overall, a Columnstore indexed table being referenced directly by the join, or through the use of the [Batch Mode on Rowstore feature](../../relational-databases/performance/intelligent-query-processing.md#batch-mode-on-rowstore).
-=======
 - The Hash join uses [Batch mode](../../relational-databases/performance/query-processing-architecture-guide.md#batch-mode-execution) - enabled through the presence of a Columnstore index in the query overall, a Columnstore indexed table being referenced directly by the join, or through the use of the [Batch Mode on Rowstore feature](../../relational-databases/intelligent-query-processing.md#batch-mode-on-rowstore).
->>>>>>> 02db14c52b23dd52a51f87dc7cd9354590189585
 - The generated alternative solutions of the Nested Loops join and Hash join should have the same first child (outer reference).
 
 ### Adaptive threshold rows