diff --git a/app/Views/_message_block.php b/app/Views/_message_block.php
index f086baf6..692baf70 100644
--- a/app/Views/_message_block.php
+++ b/app/Views/_message_block.php
@@ -11,19 +11,10 @@
 <?php endif; ?>
 
 <?php if (session()->has('errors')): ?>
-<<<<<<< HEAD
-	<ul class="px-4 py-2 mb-4 font-semibold text-red-900 bg-red-200 border border-red-700">
-	<?php foreach (session('errors') as $error): ?>
-		<li><?= $error ?></li>
-	<?php endforeach; ?>
-	</ul>
-<?php endif;
-?>
-=======
     <ul class="px-4 py-2 mb-4 font-semibold text-red-900 bg-red-200 border border-red-700">
     <?php foreach (session('errors') as $error): ?>
         <li><?= $error ?></li>
     <?php endforeach; ?>
     </ul>
-<?php endif; ?>
->>>>>>> ef31ffe... refactor: add php_codesniffer to define castopod's coding style based on psr-1
+<?php endif;
+?>
diff --git a/app/Views/episode.php b/app/Views/episode.php
index e943eb9b..9baa9270 100644
--- a/app/Views/episode.php
+++ b/app/Views/episode.php
@@ -105,29 +105,6 @@
         </div>
       </header>
 
-<<<<<<< HEAD
-<a class="underline hover:no-underline" href="<?= route_to(
-    'podcast',
-    $podcast->name
-) ?>">< <?= lang('Episode.back_to_podcast') ?></a>
-<h1 class="text-2xl font-semibold"><?= $episode->title ?></h1>
-<img src="<?= $episode->image_url ?>" alt="Episode cover"  class="object-cover w-40 h-40 mb-6" />
-<audio controls preload="none" class="mb-12">
-  <source src="<?= $episode->enclosure_url ?>" type="<?= $episode->enclosure_type ?>">
-  Your browser does not support the audio tag.
-</audio>
-
-<<<<<<< HEAD
-<?= $this->endSection()
-?>
-=======
-<section class="prose">
-<?= $episode->description_html ?>
-</section>
-
-<?= $this->endSection() ?>
->>>>>>> 240f1d4... feat: enhance ui using javascript in admin area
-=======
       <section class="w-full max-w-3xl px-2 py-6 mx-auto prose md:px-6">
       <?= $episode->description_html ?>
       </section>
@@ -144,5 +121,4 @@
             </div>
         </div>
     </footer>
-</body>
->>>>>>> ecc68b2... feat(public-ui): adapt wireframes to public podcast and episode pages
+</body>
\ No newline at end of file
diff --git a/app/Views/episodes/view.php b/app/Views/episodes/view.php
deleted file mode 100644
index 63a3a7b7..00000000
--- a/app/Views/episodes/view.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?= $this->extend('layouts/default') ?>
-
-<?= $this->section('content') ?>
-
-<h1 class="text-2xl font-semibold"><?= $episode->title ?></h1>
-<img src="<?= media_url(
-    $episode->image ? $episode->image : $podcast->image
-) ?>" alt="Episode cover"  class="object-cover w-40 h-40 mb-6" />
-<audio controls preload="none">
-  <source src="<?= podcast_url(
-      $episode->podcast_id,
-      $episode->id,
-      $podcast->name,
-      $episode->enclosure_url
-  ) ?>" type="<?= $episode->enclosure_type ?>">
-  Your browser does not support the audio tag.
-</audio>
-
-<?= $this->endSection()
-?>
diff --git a/app/Views/podcast.php b/app/Views/podcast.php
index e2f6fa7b..346e296f 100644
--- a/app/Views/podcast.php
+++ b/app/Views/podcast.php
@@ -79,11 +79,6 @@
             </div>
         </header>
 
-<<<<<<< HEAD
-
-<?= $this->endSection()
-?>
-=======
         <section class="flex flex-col">
             <nav class="inline-flex justify-center px-4 bg-gray-100 border-b">
                 <?php foreach ($episodesNav as $link): ?>
@@ -176,4 +171,3 @@
         </div>
     </footer>
 </body>
->>>>>>> ecc68b2... feat(public-ui): adapt wireframes to public podcast and episode pages