diff --git a/server/controllers/Auth.js b/server/controllers/Auth.js
index e3c2b95..57982fa 100644
--- a/server/controllers/Auth.js
+++ b/server/controllers/Auth.js
@@ -3,9 +3,7 @@ const User = require("../models/studentLoginInfo");
 const jwt = require("jsonwebtoken");
 const Canteen = require("../models/canteenLoginInfo");
 const Session = require("../models/session");
-<<<<<<< HEAD
 const Contact = require('../models/Contact');
-=======
 const {
   forgotPasswordToken,
   verifyToken,
@@ -13,8 +11,6 @@ const {
   findUserById,
 } = require("../utils/PasswordTokenAndUser");
 const nodemailer = require("nodemailer");
->>>>>>> upstream/main
-
 require("dotenv").config();
 
 exports.studentSignup = async (req, res) => {
@@ -445,8 +441,6 @@ exports.changeCanteenPassword = async (req, res) => {
   });
 };
 
-<<<<<<< HEAD
-
 //contactUs
 
 exports.saveContactMessage = async (req, res) => {
@@ -463,8 +457,6 @@ exports.saveContactMessage = async (req, res) => {
     res.status(500).send('Error saving message');
   }
 };
-
-=======
 // verify user for reset password
 exports.forgotPassword = async (req, res) => {
   try {
@@ -602,4 +594,4 @@ exports.resetPassword = async (req, res) => {
     res.status(500).json("Some error occurred!");
   }
 };
->>>>>>> upstream/main
+