diff --git a/auth/assets/templates/signup.html.tpl b/auth/assets/templates/signup.html.tpl
index 7dc2a7858..a0d949291 100644
--- a/auth/assets/templates/signup.html.tpl
+++ b/auth/assets/templates/signup.html.tpl
@@ -74,13 +74,8 @@
 			>{{ tr "signup.template.form.button.sign-up" }}</button>
 		</div>
 	</form>
-<<<<<<< HEAD
-	<div class="text-center my-3">{{ tr "signup.template.form.link.alternative" }}
-		<a href="{{ links.Login }}">{{ tr "signup.template.form.link.login" }}</a>
-=======
 	<div class="text-center my-3">
 		{{ tr "signup.template.log-in" "link" links.Login }}
->>>>>>> 838e629a... Translation fixes
 	</div>
 </div>