diff --git a/app/views/layout.phtml b/app/views/layout.phtml
index b872f4b..bb8283e 100644
--- a/app/views/layout.phtml
+++ b/app/views/layout.phtml
@@ -2,13 +2,8 @@
 <head>
   <title>Еженедельник Аргументы Недели - <?=$title?></title>
   <script src="/pub/scripts/pdf.min.js"></script>
-<<<<<<< HEAD
-  <script src="/pub/scripts/anviewer.js?ver=24"></script>
-  <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=29">
-=======
   <script src="/pub/scripts/anviewer.js?ver=43"></script>
   <link rel="stylesheet" type="text/css" href="/pub/css/an.css?ver=31">
->>>>>>> fc16e31bc487b551c5611edcb405aca735ce6f38
   <link rel="icon" type="image/ico" href="https://argumenti.ru/favicon.ico">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="https://use.fontawesome.com/29b1d5a52d.js"></script>
