diff --git a/content/contents/default.blade.php b/content/contents/default.blade.php
index b615c32..81cd15e 100644
--- a/content/contents/default.blade.php
+++ b/content/contents/default.blade.php
@@ -57,7 +57,11 @@
                     <div class="col-lg-8">
                         <div class="inf">
                             <div class="text color-666 mb-20">
+<<<<<<< HEAD
                                 {{$content->beschreibung}}
+=======
+                                {{$content->short_description}}
+>>>>>>> 83f15e6d8b628abe7ee914c80d12a85bf0e5e2ff
                             </div>
 
                         </div>