diff --git a/x-clone-backend/index.js b/x-clone-backend/index.js
index 53b67e8..88ad08e 100644
--- a/x-clone-backend/index.js
+++ b/x-clone-backend/index.js
@@ -10,10 +10,6 @@ app.use(express.json())
 const port = process.env.PORT || 5000
 const uri = process.env.ATLAS_URI
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 42a8091ddfa56f48c408782c22d0eea1f8473aee
 const connectDB = async () => {
     try {
         await mongoose.connect(uri)
@@ -316,4 +312,4 @@ app.post('/likePost', (req, res) => {
 
 app.listen(port, () => {
     console.log(`Server is running on port: ${port}`)
-})
\ No newline at end of file
+})