message: Bugfix#573: CSS profile layout
  Solved merge conflict.
diff: @@ -10,9 +10,6 @@ $viewWidth: 300px;
  width: 2.5rem;
  }
  -.user-form {
  - width: $viewWidth;
  -
  .edit-user-wrapper {
  align-items: center;
  display: flex;
  @@ -31,4 +28,3 @@ $viewWidth: 300px;
  width: $viewWidth;
  }
  }
  \ No newline at end of file
  -}
  \ No newline at end of file
  