diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml
index e2156df..385912e 100644
--- a/WebContent/META-INF/context.xml
+++ b/WebContent/META-INF/context.xml
@@ -25,12 +25,6 @@
 
     <!-- url: The JDBC connection url for connecting to your MySQL database.
          -->
-<<<<<<< HEAD
-  <Resource name="jdbc/dsOBP_AGW" auth="Container" type="javax.sql.DataSource"
-               maxTotal="10" maxIdle="10" maxWaitMillis="10000"
-               username="AGWAPP" password="AGWAPP123!" driverClassName="oracle.jdbc.OracleDriver"
-               url="jdbc:oracle:thin:@192.168.240.177:1599:DAPM"/>
-=======
     <!-- 
   	<Resource name="NDAPIGW_APP_NXA" auth="Container" type="javax.sql.DataSource"
                maxTotal="10" initialSize="10" maxIdle="10" maxActive="10" maxWaitMillis="10000"
@@ -64,6 +58,5 @@
                url="jdbc:oracle:thin:@//192.168.240.177:1599/DAPM"/>
 
 
->>>>>>> 05596e9 (KJBank 암호화 관련 및 Sync 관련 수정)
 
 </Context>
\ No newline at end of file