diff --git a/database/entity/0082-introduce_gms_registration/User.ts b/database/entity/0082-introduce_gms_registration/User.ts
index 46c7898a5..3dc0dccb6 100644
--- a/database/entity/0082-introduce_gms_registration/User.ts
+++ b/database/entity/0082-introduce_gms_registration/User.ts
@@ -14,7 +14,6 @@ import { Contribution } from '../Contribution'
 import { ContributionMessage } from '../ContributionMessage'
 import { UserContact } from '../UserContact'
 import { UserRole } from '../UserRole'
-<<<<<<< HEAD
 import { GeometryTransformer } from '../../src/typeorm/GeometryTransformer'
 import { Community } from '../Community'