chore: fixed conflicts

Signed-off-by: Adithya Krishna <adikrish@redhat.com>

apps/web/src/components/forms/signup.tsx

@@ -20,7 +20,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 export const ZSignUpFormSchema = z.object({
   name: z.string().min(1),
   email: z.string().email().min(1),
-  password: z.string().min(1),
+  password: z.string().min(6).max(72),
 });
 
 export type TSignUpFormSchema = z.infer<typeof ZSignUpFormSchema>;
@@ -109,6 +109,9 @@ export const SignUpForm = ({ className }: SignUpFormProps) => {
           <Input
             id="password"
             type={showPassword ? 'text' : 'password'}
+            minLength={6}
+            maxLength={72}
+            autoComplete="new-password"
             className="bg-background mt-2 pr-10"
             {...register('password')}
           />