diff --git a/chains/chains_testnet.json b/chains/chains_testnet.json
index 281da43c..736d2e18 100644
--- a/chains/chains_testnet.json
+++ b/chains/chains_testnet.json
@@ -15,4 +15,4 @@
         "id": "0002",
         "url": "https://bsc-1.stakesquid-db.ml/pokttest"
     }
-]
\ No newline at end of file
+]
diff --git a/prometheus/prometheus-lt-1.yml b/prometheus/prometheus-lt-1.yml
index 1f3aa8cd..11712eec 100644
--- a/prometheus/prometheus-lt-1.yml
+++ b/prometheus/prometheus-lt-1.yml
@@ -34,12 +34,15 @@ scrape_configs:
     static_configs:
       - targets: ['pushgateway:9091']
 
+<<<<<<< HEAD
   - job_name: 'haproxy'
     scrape_interval: 10s
     honor_labels: true
     static_configs:
       - targets: ['haproxy:8404']
 
+=======
+>>>>>>> 1c81b55c1b3df1b60e7a85164abc3d78db0f7607
   - job_name: 'pocket-lt-1'
     scrape_interval: 10s
     honor_labels: true