Merge pull request LambdaTest#1268 from amanchopra1905/stage

added the special case 1

Author: surishubham

docs/hyperexecute-run-jmeter-tests.md

@@ -49,11 +49,8 @@ import {YOUR_LAMBDATEST_USERNAME, YOUR_LAMBDATEST_ACCESS_KEY} from "@site/src/co
 
 You can use your own project to configure and test it. For demo purposes, we are using the sample repository.
 
-<<<<<<< HEAD
 > By default, HyperExecute supports **standard Thread Group** but you can use other custom thread groups as well.
 
-=======
->>>>>>> be5c9261 (Merge pull request #1266 from amanchopra1905/stage)
 :::tip Sample repo
 Download or Clone the code sample for the JMeter Performance Testing from the LambdaTest GitHub repository to run the tests on the HyperExecute.
 
@@ -132,7 +129,6 @@ You can analyze the number of requests sent on that particular time.
 - You can check the logs of your Jobs executed.
 
 <img loading="lazy" src={require('../assets/images/hyperexecute/frameworks/performance_testing/logs.png').default} alt="HyperExecute"  width="1920" height="868" className="doc_img"/>
-<<<<<<< HEAD
 
 ## Handling Special Scenarios: Overriding and Default Values
 
@@ -196,6 +192,4 @@ You can analyze the number of requests sent on that particular time.
   - **Importance of Overrides :** To distribute users proportionally across machines and regions, use the UI to override parameters such as total users, maximum users per machine, or load percentages.
 
   This behavior highlights how HyperExecute ensures flexibility in test execution while allowing for configuration control based on project requirements.
-</details>
-=======
->>>>>>> be5c9261 (Merge pull request #1266 from amanchopra1905/stage)
+</details>