diff --git a/_data-prepper/configure-logstash-data-prepper.md b/_data-prepper/configure-logstash-data-prepper.md
index df3f66f3..f25cbd80 100644
--- a/_data-prepper/configure-logstash-data-prepper.md
+++ b/_data-prepper/configure-logstash-data-prepper.md
@@ -2,12 +2,9 @@
 layout: default
 title: Configure Logstash for Data Prepper
 parent: Data Prepper
-<<<<<<< HEAD:_data-prepper/configure-logstash-data-prepper.md
 nav_order: 12
-=======
-nav_order: 2
->>>>>>> main:_clients/data-prepper/configure-logstash-data-prepper.md
 ---
+
 # Configure Logstash for Data Prepper
 You can run Data Prepper with a Logstash configuration.
 
@@ -45,4 +42,4 @@ The following output in your terminal indicates that Data Prepper is running cor
 
 ```
 INFO  org.opensearch.dataprepper.pipeline.ProcessWorker - log-pipeline Worker: No records received from buffer
-```
\ No newline at end of file
+```