fixed merge conflict

.gitlab-ci.yml

package-lock.json

package.json

src/App.vue

src/api/core/ApiError.ts

src/api/core/ApiRequestOptions.ts

src/api/core/ApiResult.ts

src/api/core/CancelablePromise.ts

src/api/core/OpenAPI.ts

src/api/core/request.ts

src/api/index.ts

src/assets/icons/danger.svg

src/components/Buttons/Button1.vue

src/components/Exceptions/ErrorBoundaryCatcher.vue

src/components/Exceptions/ErrorBox.vue

src/components/Exceptions/unkownErrorHandler.ts

src/components/InputFields/BaseInput.vue

src/components/Login/Login.vue

src/components/Login/LoginForm.vue

src/components/NewsComponents/NewsComponent.vue