Fix merge conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts

index 760ef9c7..bf27fc11 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, FindOneOptions, FindOptionsSelectByString, JoinColumn, OneToMany, OneToOne } from "typeorm";
+import { Column, Entity, FindOneOptions, FindOptionsSelectByString, JoinColumn, OneToMany, OneToOne, Relation } from "typeorm";
 import { Member, Session, UserSettings } from ".";
 import { Config, FieldErrors, Snowflake, trimSpecial } from "..";
 import { BitField } from "../util/BitField";