diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php
index 0c10142a3..119ed94c7 100644
--- a/resources/views/timeline/partial/new-form.blade.php
+++ b/resources/views/timeline/partial/new-form.blade.php
@@ -19,11 +19,7 @@
           </div>
           <div class="form-group">
             <label class="font-weight-bold text-muted small">Caption</label>
-<<<<<<< HEAD
-            <input type="text" class="form-control" name="caption" placeholder="Add a caption here" maxlength="{{config('pixelfed.max_caption_length')}}">
-=======
-            <input type="text" class="form-control" name="caption" placeholder="Add a caption here" autocomplete="off">
->>>>>>> dev
+            <input type="text" class="form-control" name="caption" placeholder="Add a caption here" autocomplete="off" maxlength="{{config('pixelfed.max_caption_length')}}">
             <small class="form-text text-muted">
               Max length: {{config('pixelfed.max_caption_length')}} characters.
             </small>