diff --git a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java
index d7ba8960..b29ae1ba 100644
--- a/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java	
+++ b/DeFi-Data-Engine/DeFi Data Engine/src/main/java/org/properties/Config.java	
@@ -44,13 +44,8 @@ public class Config {
 	stream_properties.put("rest.socket.address", "DataEngine");
 	stream_properties.put("rest.socket.port", "61100");
 	stream_properties.put("rest.socket.key", "rest-key-reserved");
-<<<<<<< HEAD
-	//stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu");
-	stream_properties.put("output.socket.address", "localhost");
-=======
-	// stream_properties.put("output.socket.address", "defi-de.idea.rpi.edu");
+	//stream_properties.put("output.socket.address", "localhost");
 	stream_properties.put("output.socket.address", "RestApp");
->>>>>>> branch 'main' of https://github.rpi.edu/DataINCITE/IDEA-DeFi-CRAFT
 	stream_properties.put("output.socket.port", "61200");
 	stream_properties.put("local.stream.type", "mongo_db");
 	stream_properties.put("mongodb.properties.uri", "mongodb://MONGO:27017");
diff --git a/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java b/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java
index 3b2872cd..2e43aef2 100644
--- a/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java	
+++ b/DeFi-Data-Engine/Rest Application/src/main/java/org/properties/Config.java	
@@ -36,15 +36,9 @@ public class Config {
 	app_properties.put("general.transfer.delim", "&&&");
 	app_properties.put("general.data.dateformat", "yyyy-MM-dd");
 	app_properties.put("spring.server.port", "8080");
-<<<<<<< HEAD
-	app_properties.put("spring.server.address", "localhost");
-	//app_properties.put("spring.server.address", "defi-de.idea.rpi.edu");
-	app_properties.put("rest.socket.address", "localhost");
-=======
-	app_properties.put("spring.server.address", "RestApp");
-	// app_properties.put("spring.server.address", "defi-de.idea.rpi.edu");
+	//app_properties.put("spring.server.address", "localhost");
 	app_properties.put("rest.socket.address", "DataEngine");
->>>>>>> branch 'main' of https://github.rpi.edu/DataINCITE/IDEA-DeFi-CRAFT
+	app_properties.put("spring.server.address", "RestApp");
 	app_properties.put("rest.socket.port", "61100");
 	app_properties.put("rest.socket.key", "rest-key-reserved");
 	properties.put("app", app_properties);