diff --git a/amadeus/staticfiles/css/base/amadeus.css b/amadeus/staticfiles/css/base/amadeus.css
index 5f4eabd..34b0c4f 100644
--- a/amadeus/staticfiles/css/base/amadeus.css
+++ b/amadeus/staticfiles/css/base/amadeus.css
@@ -18,10 +18,6 @@
     padding-bottom: 1%;
     width: 15%;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> front_cards
 .breadcrumb{
     margin-bottom: 5px;
 }
diff --git a/core/templates/guest.html b/core/templates/guest.html
index 1c8eea7..7e1e456 100644
--- a/core/templates/guest.html
+++ b/core/templates/guest.html
@@ -77,101 +77,8 @@
                         </li>
                     </ul>
                </li>
-
-<<<<<<< HEAD
-                        <li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
-                        <li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-
-                </ul>
-                </div>
-    </div>
-    {% endblock %}
-    <div class="container-fluid">
-        <div class="row">
-
-            <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
-                {% block sidebar %}
-                    <div class="panel panel-primary">
-                        <div class="panel-heading">
-                            <h4>Menu</h4>
-                        </div>
-                        <div class="panel-body">
-                            <ul class="nav nav-pills nav-stacked">
-                                <li><a href="{% url 'core:register' %}">{% trans 'Register' %}</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                {% endblock %}
-
-            </div>
-           <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
-                {% block breadcrumbs %}
-                    <div class="col-md-12">
-                        <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-                            <div class="input-group">
-                              <div class="form-group is-empty">
-                              <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-                                <span class="input-group-btn input-group-sm">
-                                  <button type="button" class="btn btn-fab btn-fab-mini">
-                                    <i class="material-icons">search</i>
-                                  </button>
-                                </span>
-                            </div>
-                        </form>
-                    </div>
-
-                <div class="col-md-10">
-                    <div class="btn-group btn-group-justified btn-group-raised">
-                        <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
-                        {% for category in categories %}
-                            <a href="?category={{category.name}}" class="btn btn-raised btn-primary">{{category.name}}</a>
-                        {% endfor %}
-                    </div>
-                </div>
-
-                {% endblock %}
-                {% block render_breadcrumbs %}{% endblock %}
-            <div>
-            </div>
-            <div class="col-xs-12 col-sm-12 col-md-10 col-lg-10 col-xl-12">
-                {% block content %}
-                    {% for course in courses %}
-                        <div class="panel panel-info panel_{{ course.id }}">
-                            <div class="panel-heading">
-                                <a href="{{ course.get_absolute_url }}" class="panel-title">{{course.name}}</a>
-                                {% if user|show_course_subscribe:course %}
-                                    <a onclick="subscribe($(this), '{% url 'course:subscribe' course.slug %}', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')" class="btn btn-sm btn-primary btn-raised pull-right" style="margin-top:-4px">{% trans 'Subscribe' %}</a>
-                                {% endif %}
-                            </div>
-
-                            <div class="panel-body">
-                                <p><b>Course Name: </b>{{course.name}}</p>
-                                <p><b>Begining: </b>{{course.init_date}}</p>
-                                <p><b>End: </b>{{course.end_date}}</p>
-                                <p><b>Professor: </b>{{course.professors.name}}</p>
-                                <p>
-                                <b>Description:</b>
-                                <i>
-                                    {{course.content}}
-                                </i>
-                                </p>
-                            </div>
-                        </div>
-                    {% endfor %}
-
-                {% endblock %}
-            </div>
-        </div>
-    </div>
-    <script src="{% static 'js/main.js' %}"></script>
-    <script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
-    {% block script_file %}
-
-    {% endblock script_file %}
-=======
              			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
              			<li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
-
            		</ul>
          		</div>
    	</div>
@@ -258,7 +165,6 @@
 	{% block script_file %}
 
 	{% endblock script_file %}
->>>>>>> front_cards
 </body>
 
 </html>
\ No newline at end of file
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index b169a9d..d3bb74f 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -43,8 +43,6 @@
     </div>
 
         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-<<<<<<< HEAD
         <div class="panel panel-primary">
             <div class="panel-heading">
                 <h3 class="panel-title">Category</h3>
@@ -57,20 +55,7 @@
             </div>
         </div>
     {% endif %}
-=======
-		<div class="panel panel-primary">
-		    <div class="panel-heading">
-		        <h3 class="panel-title">Category</h3>
-		    </div>
-		    <div class="panel-body">
-		        <ul class="nav nav-pills nav-stacked">
-		            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-		            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
-		        </ul>
-		    </div>
-		</div>
-	{% endif %}
->>>>>>> front_cards
+
 {% endblock %}
 
 {% block content %}
@@ -86,7 +71,6 @@
     {% endif %}
 
 <div class="col-md-12 cards-content">
-<<<<<<< HEAD
     <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
         <div class="input-group">
           <div class="form-group is-empty">
@@ -98,24 +82,10 @@
             </span>
         </div>
     </form>
-=======
-	<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-		<div class="input-group">
-		  <div class="form-group is-empty">
-		  <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</form>
->>>>>>> front_cards
 </div>
 
 
 </fieldset>
-<<<<<<< HEAD
     <div class="col-md-12 cards-content">
         {% if courses|length > 0 %}
             {% if request.GET.category == 'all' or none or request.GET.category == '' %}
@@ -134,26 +104,5 @@
             {% trans 'No courses found' %}
         {% endif %}
     </div>
-=======
-	<div class="col-md-12 cards-content">
-		{% if courses|length > 0 %}
-			{% if request.GET.category == 'all' or none or request.GET.category == '' %}
-				{% for course in list_courses %}
-		          	{% include "course/course_card.html" %}
-				{% endfor %}
-			{% else %}
-				{% for course in courses_category %}
-    				{% if course.category.name == request.GET.category %}
-    					<!-- Put your content here! -->
-    					{% include "course/course_card.html" %}
-    				{% endif %}
-				{% endfor %}
-			{% endif %}
-		{% else %}
-			{% trans 'No courses found' %}
-		{% endif %}
-	</div>
->>>>>>> front_cards
-
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 {% endblock %}
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 1972ccc..1e646ab 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -40,7 +40,6 @@
           </div>
         </div>
       </div>
-<<<<<<< HEAD
       <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="false" aria-hidden="true" tabindex="-1" aria-selected="false">
         <div class="panel-body">
           <div class="presentation">
@@ -74,43 +73,12 @@
                 <ul id="list-materials">
                     {% list_topic_file request topic %}
                     {% list_topic_link request topic%}
-                  
+
                 </ul>
               </div>
               <div class="col-xs-4 col-md-4">
                 <div class="resource_inline">
                   <h4>{% trans 'Activities' %}</h4>
-=======
-    </div>
-    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
-      <div class="panel-body">
-        <div class="presentation">
-          <p>
-            <i>
-              {{topic.description|linebreaks}}
-            </i>
-          </p>
-          <div class="row">
-            <div class="col-xs-6 col-md-6">
-              <div class="resource_inline">
-                <h4>Material</h4>
-              </div>
-              <div class="resource_inline">
-                <div class="dropdown">
-                  <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                  <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href=" javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">Create a Link<div class="ripple-container"><div class="ripple ripple-on ripple-out" style="left: 54.5312px; top: 22px; background-color: rgb(0, 150, 136); transform: scale(20);"></div></div></a></li>
-                      <li>
-                          <a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">
-                              {% trans "Create a file" %}
-                              <div class="ripple-container">
-                                  <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                  </div>
-                              </div>
-                          </a>
-                      </li>
-                  </ul>
->>>>>>> front_cards
                 </div>
               </div>
               <ul id="list-materials">
@@ -142,55 +110,6 @@
             </div>
             {% list_topic_poll request topic %}
           </div>
-<<<<<<< HEAD
-          <div class="editation" style="display: none">
-            <div class="form-group">
-              <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
-              <input type="text" class="form-control" value="Topic 1">
-            </div>
-            <div class="form-group is-empty">
-              <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
-              <textarea class="form-control" rows="3" id="textArea"></textarea>
-            </div>
-            <div class="row">
-              <div class=" col-xs-6 col-md-4">
-                <div class="resource_inline">
-                  <h4>{% trans 'Material' %}</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')">{% trans 'Create a Link' %}</a></li>
-                      <li>
-                        <a href="#">
-                            {% trans "Create a file" %}
-                            <div class="ripple-container">
-                                <div class="ripple ripple-on ripple-out" style="left: 33.5312px; top: 11px; background-color: rgb(0, 150, 136); transform: scale(20);">
-                                </div>
-                            </div>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                <ul id="list-materials-edit">
-                    {% list_topic_link_edit request topic%}
-                    {% list_topic_file_edit request topic %}
-                </ul>
-              </div>
-              <div class="col-xs-4 col-md-offset-1 col-md-4">
-                <div class="resource_inline">
-                  <h4>{% trans 'Activities' %}</h4>
-                </div>
-                <div class="resource_inline">
-                  <div class="dropdown">
-                    <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                    <ul class="dropdown-menu" aria-labelledby="dLabel">
-                      <li>{% trans 'Anything' %}</li>
-                    </ul>
-                  </div>
-=======
         </div>
         <div class="editation" style="display: none">
           <div class="form-group">
@@ -221,7 +140,6 @@
                       </a>
                     </li>
                   </ul>
->>>>>>> front_cards
                 </div>
               </div>
               <ul id="list-materials-edit">
@@ -229,16 +147,9 @@
                   {% list_topic_file_edit request topic %}
               </ul>
             </div>
-<<<<<<< HEAD
-            <div class="form-group">
-              <div class="col-md-10">
-                <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
-                <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
-=======
             <div class="col-xs-4 col-md-offset-1 col-md-4">
               <div class="resource_inline">
                 <h4>Activities</h4>
->>>>>>> front_cards
               </div>
               <div class="resource_inline">
                 <div class="dropdown">
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index 23a4979..e68ac34 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -15,9 +15,6 @@
 
 	</ol>
 {% endblock %}
-
-<<<<<<< HEAD
-=======
 {% block sidebar %}
 <div class="panel panel-primary">
     <div class="panel-heading">
@@ -52,7 +49,6 @@
 
 
 {% endblock %}
->>>>>>> front_cards
 
 {% block content %}
   	<div class="panel panel-info">
--
libgit2 0.21.2