diff --git a/database/entity/Community.ts b/database/entity/Community.ts
index 13fbbcf00..3b48d5c29 100644
--- a/database/entity/Community.ts
+++ b/database/entity/Community.ts
@@ -1,5 +1 @@
-<<<<<<< HEAD
-export { Community } from './0081-introduce_gms_registration/Community'
-=======
-export { Community } from './0081-user_join_community/Community'
->>>>>>> refs/remotes/origin/master
+export { Community } from './0082-introduce_gms_registration/Community'
diff --git a/database/entity/User.ts b/database/entity/User.ts
index 0cde9b36f..e3f15113d 100644
--- a/database/entity/User.ts
+++ b/database/entity/User.ts
@@ -1,5 +1 @@
-<<<<<<< HEAD
-export { User } from './0081-introduce_gms_registration/User'
-=======
-export { User } from './0081-user_join_community/User'
->>>>>>> refs/remotes/origin/master
+export { User } from './0082-introduce_gms_registration/User'