fixed smaller merge issues

scm-ui/src/repos/containers/RepositoryRoot.js

@@ -33,13 +33,8 @@ import ChangesetView from "./ChangesetView";
 import PermissionsNavLink from "../components/PermissionsNavLink";
 import Sources from "../sources/containers/Sources";
 import RepositoryNavLink from "../components/RepositoryNavLink";
-<<<<<<< working copy
-import { getRepositoriesLink } from "../../modules/indexResource";
-import { ExtensionPoint } from "@scm-manager/ui-extensions";
-=======
 import {getLinks, getRepositoriesLink} from "../../modules/indexResource";
 import {ExtensionPoint} from "@scm-manager/ui-extensions";
->>>>>>> merge rev
 
 type Props = {
   namespace: string,

scm-ui/src/users/components/UserForm.js

@@ -141,9 +141,9 @@ class UserForm extends React.Component<Props, State> {
       <>
         {subtitle}
         <form onSubmit={this.submit}>
-          <div className="columns">
+          <div className="columns is-multiline">
+            {nameField}
             <div className="column is-half">
-              {nameField}
               <InputField
                 label={t("user.displayName")}
                 onChange={this.handleDisplayNameChange}