diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html
index 75585e9d..a2fe5eaf 100644
--- a/setup/templates/steps/config.html
+++ b/setup/templates/steps/config.html
@@ -39,6 +39,7 @@ Or in plain English: if receivers start to classify your mail as spam, this post
 <div class="form-group">
   <label>Authentication rate limit per IP for failed login attempts on unique non-existing accounts (password spraying counter-measure)</label>
   <!--   Validates number input only -->
+<<<<<<< HEAD
 <<<<<<< HEAD
   <p><input class="form-control" style="width: 9%; display: inline;" type="number" name="auth_ratelimit_ip" value="5" required > / hour
   </p>
@@ -58,6 +59,9 @@ Or in plain English: if receivers start to classify your mail as spam, this post
   <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="message_ratelimit_pd" value="200" required > / day
 =======
   <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm"
+=======
+  <p><input class="form-control" style="width: 9%; display: inline;" type="number" name="auth_ratelimit_pm"
+>>>>>>> 4cfa2dbc (Increase width of rate limiting text box.)
   		value="10000" required > / minute
 >>>>>>> 58890407 (Set default of AUTH_RATELIMIT_SUBNET to False. Increase default AUTH_RATELIMIT value.)
   </p>