diff --git a/src/colab/deprecated/templates/base.html b/src/colab/deprecated/templates/base.html
index 7573da8..42c373b 100644
--- a/src/colab/deprecated/templates/base.html
+++ b/src/colab/deprecated/templates/base.html
@@ -50,17 +50,10 @@
           {% browserid_login text='Login' next=request.path %}
         </div>
         {% else %}
-<<<<<<< HEAD
         <div class="col-sm-1 text-right">
-          {% trans "authenticated as" %} <b>{{ user.email }}</b>
+          {% trans "authenticated as" %} <b>{{ user.username }}</b>
         </div>
         <div class="col-sm-1 text-center">
-=======
-        <span class="colborder">
-          {% trans "authenticated as" %} <b>{{ user.username }}</b>
-        </span>
-        <span class="colborder">
->>>>>>> master
           <a href="{% url 'user_profile' user.username %}">
             {% trans "My Profile" %}
           </a>
--
libgit2 0.21.2