diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html
index 9b6fb170..1b8586b6 100644
--- a/datacenterlight/templates/datacenterlight/calculator_form.html
+++ b/datacenterlight/templates/datacenterlight/calculator_form.html
@@ -81,45 +81,6 @@
         <!--<div class="description check-ip">
             <input type="checkbox" name="ipv6"> Ipv6 Only<br>
         </div>-->
-        {% comment %}
-        <div class="form-group">
-            <div class="description input justify-center">
-                <label for="name" class="control-label">{% trans "Name"%}</label>
-                <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}"
-                       data-minlength="3" data-error="{% trans 'Please enter your name.' %}" required>
-            </div>
-            <div class="help-block with-errors">
-                {% for message in messages %}
-                {% if 'name' in message.tags %}
-                <ul class="list-unstyled">
-                    <li>
-                        {{ message|safe }}
-                    </li>
-                </ul>
-                {% endif %}
-                {% endfor %}
-            </div>
-        </div>
-        <div class="form-group">
-            <div class="description input justify-center">
-                <label for="email" class="control-label">{% trans "Email"%}</label>
-                <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control"
-                       placeholder="{% trans 'Your Email' %}"
-                       data-error="{% trans 'Please enter a valid email address.' %}" required>
-            </div>
-            <div class="help-block with-errors">
-                {% for message in messages %}
-                {% if 'email' in message.tags %}
-                <ul class="list-unstyled">
-                    <li>
-                        {{ message|safe }}
-                    </li>
-                </ul>
-                {% endif %}
-                {% endfor %}
-            </div>
-        </div>
-        {% endcomment %}
     </div>
     <input type="submit" class="btn btn-primary disabled" value="{% trans 'Continue' %}"></input>
 </form>
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index b3646fa5..1a2348ec 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -8,11 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-09-11 23:47+0530\n"
-=======
 "POT-Creation-Date: 2017-09-14 12:27+0000\n"
->>>>>>> master
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"