diff --git a/src/index.js b/src/index.js
index 0aaf493..1d520c5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,18 +1,11 @@
 import pdfLib from "pdf-to-printer";
 import { jsPDF } from "jspdf";
 import fs from "fs";
-<<<<<<< HEAD
-import puppeteer from "puppeteer";
-import express from "express";
-import Joi from "joi";
-import TelegramBot from "node-telegram-bot-api";
-=======
 import puppeteer from 'puppeteer';
 import express from 'express';
 import Joi from 'joi';
 import TelegramBot from 'node-telegram-bot-api';
 import https from 'https';
->>>>>>> f7a7fa7d73eb3cc7af05ff42d4a8f9eefeae2aec
 
 const Logo = fs.readFileSync("./assets/Logo_fwaur.png", { encoding: "latin1" });
 const config = JSON.parse(fs.readFileSync("./config.json", "utf8"));