chore: fixed conflicts

frontend/src/components/Modals/EditProfile.vue

@@ -222,8 +222,8 @@ watch(
 
 watch(
 	() => profile.language,
-	(newVal, oldVal) => {
-		if (newVal !== oldVal) {
+	() => {
+		if (profile.language !== props.profile.data.language) {
 			hasLanguageChanged.value = true
 		}
 	}

frontend/src/socket.js

@@ -12,6 +12,5 @@ export function initSocket() {
 		withCredentials: true,
 		reconnectionAttempts: 5,
 	})
-
 	return socket
 }