diff --git a/rrs/views.py b/rrs/views.py
index 3a4034a..752485e 100644
--- a/rrs/views.py
+++ b/rrs/views.py
@@ -166,7 +166,7 @@ def _get_recipe_list(milestone):
 
     recipes = Raw.get_reupg_by_date(milestone.end_date)
     for i,re in enumerate(recipes):
-        if re.has_key('pv'):
+        if 'pv' in re:
             recipes[i]['version'] = re['pv']
         recipes_ids.append(re['id'])
 
diff --git a/templates/base.html b/templates/base.html
index 07ce8c6..7d3ef3a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -113,7 +113,7 @@
             &bull; <a href="{% url 'about' %}">about this site</a>
             &bull; <a href="http://www.openembedded.org/Layers_FAQ">FAQ</a>
             {% else %}
-            <a href="{% url about %}">About the Recipe Reporting System</a>
+            <a href="{% url 'about' %}">About the Recipe Reporting System</a>
             &bull; <a href="https://www.yoctoproject.org/about">About the Yocto Project</a>
             {% endif %}
         </div>
diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html
index 4795822..fc3395c 100644
--- a/templates/rrs/recipedetail.html
+++ b/templates/rrs/recipedetail.html
@@ -44,7 +44,7 @@
             <li class="lead">Upstream version: <span>{{ upstream_version }}</span></li>
             {% endif %}
             <li class="divider-vertical"></li>
-            <li class="lead">Maintainer: <span><a href="{% url recipes release_name milestone_name %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
+            <li class="lead">Maintainer: <span><a href="{% url 'recipes' 'release_name' 'milestone_name' %}?maintainer_name={{ maintainer_name|urlencode }}">{{ maintainer_name }}</a></span></li>
             <li class="divider-vertical"></li>
         </ul>
     </div>
@@ -79,7 +79,7 @@
                     <td>{{ rud.version }}</td>
                     {% if rud.milestone_name %}
                     <td>
-                        <a href="{% url recipes rud.release_name rud.milestone_name %}">
+                        <a href="{% url 'recipes' 'rud.release_name' 'rud.milestone_name' %}">
                             {{ rud.release_name }}
                             {% if rud.milestone_name != "All" %}
                             {{ rud.milestone_name }}
@@ -97,7 +97,7 @@
                     <td>{{ rud.date }}</td>
 
                     {% if rud.is_recipe_maintainer %} 
-                    <td><a href="{% url recipes rud.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
+                    <td><a href="{% url 'recipes' 'rud.release_name' 'rud.milestone_name' %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td>
                     {% else %}
                     <td>{{ rud.maintainer_name }}</a></td>
                     {% endif %}
diff --git a/urls.py b/urls.py
index 9cf17b0..fe9bb22 100644
--- a/urls.py
+++ b/urls.py
@@ -5,15 +5,10 @@
 # Copyright (c) Django Software Foundation and individual contributors.
 # All rights reserved.
 
-<<<<<<< HEAD
-import settings
 
-from django.conf.urls.defaults import patterns, include, url
-from django.views.generic.simple import redirect_to
-=======
+import settings
 from django.conf.urls import patterns, include, url
 from django.views.generic import RedirectView
->>>>>>> 5c17970... Upgrade to Django 1.6+
 
 from django.contrib import admin
 admin.autodiscover()