diff --git a/ui/templates/inc/page.html b/ui/templates/inc/page.html
index 39870c1ff3080e241415c592b2ab077e2e84575f..ca5d81908096ba9f0323172552639822a7d98550 100644
--- a/ui/templates/inc/page.html
+++ b/ui/templates/inc/page.html
@@ -33,12 +33,8 @@
{{end}}
{{define "header_login"}}{{template "header" .}}
-<<<<<<< HEAD
- <body class="d-flex align-items-center py-4 bg-body-tertiary vh-100">
-=======
<body>
<div class="d-flex align-items-center py-4 bg-body-tertiary vh-100">
->>>>>>> 0f7aea3 (Replace Bootstrap with Material Design For Bootstrap)
<main class="form-signin w-50 m-auto">
<div class="d-flex flex-row">