diff --git a/idpython/templates/base.html b/idpython/templates/base.html
index 9879617..98edbe1 100644
--- a/idpython/templates/base.html
+++ b/idpython/templates/base.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!doctype html>
 <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
 <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
@@ -32,6 +31,9 @@
 
 </head>
 
+{% load cms_tags sekizai_tags %}
+{% render_block "css" %}
+
 <body>
     <!-- Prompt IE 6 users to install Chrome Frame. Remove this if you support IE 6.
        chromium.org/developers/how-tos/chrome-frame-getting-started -->
@@ -105,6 +107,10 @@ <h1>Python adalah bahasa pemrograman yang memungkinkan Anda untuk bekerja dengan
                     <hr>
                 </div>
             </div>
+            <div class='row'>
+                {% placeholder base_content %}
+                {% block base_content %} {% endblock%}
+            </div>
             <div class = 'row'>
                 <div class = 'fourcol'>
                     <h2>BERITA</h2>
@@ -179,4 +185,5 @@ <h3>Lorem Ipsum</h3>
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.7.2.min.js"><\/script>')</script>  
 </body>
+{% render_block "js" %}
 </html>
diff --git a/idpython/templates/template_1.html b/idpython/templates/template_1.html
index a5549bd..1592836 100644
--- a/idpython/templates/template_1.html
+++ b/idpython/templates/template_1.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load cms_tags %}
+{% load cms_tags sekizai_tags %}
 
 {% block base_content %}
     {% placeholder template_1_content %}
