diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
index 1b2ab87..92759d9 100644
--- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
+++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt
@@ -66,7 +66,6 @@ object Constants {
         "HC-V1-020",
         "HCV-000-3001",
         "HCV-000-3002",
-<<<<<<< HEAD
         "HCV-000-3003",
         "HCV-000-3004",
         "HCV-000-3005",
@@ -75,9 +74,6 @@ object Constants {
         "HCV-000-3008",
         "HCV-000-3009",
         "HCV-000-3010"
-=======
-        "devuser",
->>>>>>> hb3-hb4
     )
 
     const val password = "SMI@12345"
diff --git a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
index ab68348..49115b7 100644
--- a/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
@@ -11,11 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.google.android.datatransport.runtime.dagger.Provides
 import javax.inject.Singleton
 
-<<<<<<< HEAD
 @Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 13, exportSchema = false)
-=======
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 12, exportSchema = false)
->>>>>>> hb3-hb4
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao