Update profile.pug to resolve merge conflict

views/DE/account/profile.pug

@@ -16,11 +16,11 @@ html(lang="de")
                         ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
                             li(class="nav-item")
                                 a(class="nav-link pl-0 text-nowrap" href="/account/")
-                                    span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
+                                    span(class="font-weight-bold color_black") #{user.firstName} #{user.lastName}
                             li(class="nav-item")
                                 a(class="nav-link pl-0" href="/account/profile")
-                                    i(class="fa fa-user fa-fw" style="color:black;")
-                                    span(class="d-none d-md-inline" style="color:black;") Benutzerprofil
+                                    i(class="fa fa-user fa-fw color_black")
+                                    span(class="d-none d-md-inline color_black") Benutzerprofil
                             if user.is_m4lab_idp
                                 li(class="nav-item")
                                     a(class="nav-link pl-0" href="/account/security")
@@ -107,4 +107,4 @@ html(lang="de")
     // Bootstrap
     script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
     // M4_LAB
-    script(src="/js/headfoot.js")
+    script(src="/js/headfoot.js")
\ No newline at end of file