diff --git a/front/models/User.ts b/front/models/User.ts
index 6f63543..e4bc5a1 100644
--- a/front/models/User.ts
+++ b/front/models/User.ts
@@ -7,12 +7,8 @@ export const UserValidator = yup
 	.object({
 		username: yup.string().required(),
 		password: yup.string().required().nullable(),
-<<<<<<< HEAD
-		email: yup.string().required(),
 		emailVerified: yup.boolean().required(),
-=======
 		email: yup.string().required().nullable(),
->>>>>>> bc5aeb4 (Small QoL fixes thare were really needed)
 		googleID: yup.string().required().nullable(),
 		isGuest: yup.boolean().required(),
 		partyPlayed: yup.number().required(),