diff --git a/ofu_app/templates/macros/food_macros.jinja b/ofu_app/templates/macros/food_macros.jinja
index f51965f..5930817 100644
--- a/ofu_app/templates/macros/food_macros.jinja
+++ b/ofu_app/templates/macros/food_macros.jinja
@@ -35,24 +35,6 @@
         {% for single_food in menu %}
             <li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item">
                 <div class="row">
-<<<<<<< HEAD
-                    <div class="food-name col-8"><p>{{ single_food.name }}</p></div>
-                    {#<div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024"
-                                                          height="800"><i class="img-placeholder fa fa-cutlery text-right"></i></div>#}
-                </div>
-                <div class="row">
-                    <div class="rating-wrapper col-6 text-left"></div>
-                    {#<div class="col-6 text-right">
-                        <label for="pic-upload-{{ single_food.id }}" class="custom-pic-upload">
-                            <i class="fa fa-camera" aria-hidden="true"></i>
-                        </label>
-                        <div class="pic-input-wrapper">
-#}{#                             TODO: extract style to external css file#}{#
-                            <input id="pic-upload-{{ single_food.id }}" class="pic-upload" type="file" name="photo"
-                                   id="upload-photo" style="display: none !important;"/>
-                        </div>
-                    </div>#}
-=======
                     <div class="food-name col-8"><a href="{{ url('food-detail', args=[single_food.id]) }}"><p>{{ single_food.name }}</p></a></div>
                     <div class="col-4"><span class="float-right">{{ single_food.price_student}}</span></div>
                     {# <div class="image-wrapper col-4"><img src="" class="img-rounded img" alt="" width="1024"
@@ -70,7 +52,6 @@
                                    id="upload-photo" style="display: none !important;"/>
                         </div> #}
                     </div>
->>>>>>> develop
                 </div>
             </li>
         {% endfor %}