resolve conficts

diff --cc app/templates/base.html
index f08c46807e870959bc70e3e439bbb2bfbe7663d9,0afc3dbf1e835e35e55f64fd6bab28cfe4194034..ba311048ee572dd68e03f9b7544d9bbf13ab8755
--- 1/app/templates/base.html
--- 2/app/templates/base.html
+++ b/app/templates/base.html
@@@ -67,7 -67,29 +67,29 @@@
              {% block content_footer %}{% endblock %}
          </main>
  
-         {% include "twitter/tweets.html" %}
+         <div class="section container">
+             <div class="row">
+ 
+                 <div class="col-sm-8 tac">
+                     <div class="section-title section-title--uppercase section-title--underline section-title--accent">
+                         {% trans "Instagram feed" %}
+                     </div>
+                     <div>
+                         INSTAGRAM HERE
+                     </div>
+                 </div>
+ 
+                 <div class="col-sm-6 col-sm-push-1 tac">
+                     <div class="section-title section-title--uppercase section-title--underline section-title--main">
+                         {% trans "Twitter feed" %}
+                     </div>
+                     <div>
 -                        {% include "twitter/hashtag.html" %}
++                        {% include "twitter/tweets.html" %}
+                     </div>
+                 </div>
+ 
+             </div>
+         </div>
  
          <footer class="footer" role="footer">
              {% include "includes/footer.html" %}