diff --git a/config/test.env b/config/test.env
index de136a683..f7df0aa72 100644
--- a/config/test.env
+++ b/config/test.env
@@ -195,11 +195,8 @@ MATCHING_FUND_DONATIONS_FROM_ADDRESS=0x6e8873085530406995170Da467010565968C7C62
 # Rate Limit config
 DISABLE_SERVER_RATE_LIMITER=false
 DISABLE_SERVER_CORS=false
-<<<<<<< HEAD
-=======
-SOLANA_NODE_RPC_URL=
->>>>>>> master
 
+SOLANA_NODE_RPC_URL=
 SOLANA_MAINNET_NODE_RPC_URL=
 SOLANA_DEVNET_NODE_RPC_URL=
 SOLANA_TEST_NODE_RPC_URL=
@@ -212,4 +209,3 @@ LOST_DONATIONS_QF_ROUND=
 LOST_DONATIONS_NETWORK_ID=10
 
 DISABLE_NOTIFICATION_CENTER=false
->>>>>>> master