diff --git a/src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java b/src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java
index f35e319..b5d84dc 100644
--- a/src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java
+++ b/src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java
@@ -25,13 +25,8 @@ public class KjbNotRnnoJpaAttributeConverter implements AttributeConverter<Strin
 
         String originalAttribute = attribute;
         if (StringUtils.isNotEmpty(attribute)) {
-<<<<<<< HEAD:src/main/java/com/eactive/ext/kjb/safedb/SafeDBMNotRnnoConverter.java
-            SafeDBWrapper safeDBWrapper = SafeDBWrapper.getInstance();
-            attribute = safeDBWrapper.encryptNotRnnoString(attribute);
-=======
             KjbSafedbWrapper wrapper = KjbSafedbWrapper.getInstance();
             attribute = wrapper.encryptNotRnnoString(attribute);
->>>>>>> 24cf3d16793cadad6d3810c0d0070a8d23834a0d:src/main/java/kjb/safedb/KjbNotRnnoJpaAttributeConverter.java
         }
 
         log.debug("DB 암호화 #2 : {} -> {}", originalAttribute, attribute);