librenmsfail

error: Your local changes to the following files would be overwritten by merge:
	.editorconfig
	.gitignore
	.travis.yml
	LibreNMS/Alert/Transport/Alertmanager.php
	LibreNMS/Alert/Transport/Elasticsearch.php
	LibreNMS/Alert/Transport/Mattermost.php
	LibreNMS/Util/Laravel.php
	LibreNMS/Util/ModuleTestHelper.php
	LibreNMS/Validations/Database.php
	app/Console/Kernel.php
	app/Exceptions/Handler.php
	app/Http/Controllers/Auth/RegisterController.php
	app/Http/Kernel.php
	app/Http/Middleware/EncryptCookies.php
	app/Http/Middleware/TrimStrings.php
	app/Http/Middleware/VerifyCsrfToken.php
	app/Providers/AppServiceProvider.php
	app/Providers/EventServiceProvider.php
	artisan
	bootstrap/app.php
	composer.json
	composer.lock
	config/app.php
	config/broadcasting.php
	config/cache.php
	config/database.php
	config/debugbar.php
	config/filesystems.php
	config/mail.php
	config/queue.php
	config/services.php
	config/session.php
	config/trustedproxy.php
	config/view.php
	database/seeds/DatabaseSeeder.php
	doc/Alerting/Creating-Transport.md
	doc/Alerting/Templates.md
	doc/Extensions/Smokeping.md
	doc/Support/Adding-a-Device.md
	html/includes/forms/convert-template.inc.php
	html/legacy_index.php
	includes/definitions/discovery/saf-cfm.yaml
	includes/polling/ports.inc.php
	misc/os_schema.json
	package.json
	phpunit.xml
	resources/lang/en/validation.php
	resources/views/layouts/librenmsv1.blade.php
	resources/views/welcome.blade.php
	routes/web.php
	storage/framework/cache/.gitignore
	tests/AlertingTest.php
	tests/AuthSSOTest.php
	tests/DBSetupTest.php
	tests/DocsTest.php
	tests/IpTest.php
	tests/LockTest.php
	tests/RrdtoolTest.php
	tests/TestCase.php
	tests/bootstrap.php
	webpack.mix.js
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
	app/Http/Controllers/Auth/VerificationController.php
	config/hashing.php
	config/logging.php
	config/tinker.php
	html/svg/403.svg
	html/svg/404.svg
	html/svg/500.svg
	html/svg/503.svg
	includes/definitions/discovery/nokia-isam.yaml
	includes/definitions/nokia-isam.yaml
	includes/discovery/mempools/nokia-isam.inc.php
	includes/discovery/sensors/dbm/nokia-isam.inc.php
	includes/discovery/sensors/pre-cache/nokia-isam.inc.php
	includes/discovery/sensors/state/nokia-isam.inc.php
	includes/discovery/sensors/temperature/nokia-isam.inc.php
	includes/polling/mempools/nokia-isam.inc.php
	includes/polling/os/nokia-isam.inc.php
	includes/polling/ports/nokia-isam.inc.php
	includes/polling/sensors/state/eds.inc.php
	includes/polling/sensors/temperature/eds.inc.php
	mibs/nokia/ASAM-ALARM-MIB
	mibs/nokia/ASAM-EQUIP-MIB
	mibs/nokia/ASAM-SYSTEM-MIB
	mibs/nokia/ASAM-TC-MIB
	mibs/nokia/ITF-MIB
	mibs/nokia/ITF-MIB-EXT
	mibs/nokia/SFP-MIB
	mibs/nokia/SYSTEM-MIB
	resources/js/app.js
	resources/js/bootstrap.js
	resources/js/components/ExampleComponent.vue
	resources/sass/_variables.scss
	resources/sass/app.scss
	tests/data/nokia-isam.json
	tests/snmpsim/nokia-isam.snmprec
Please move or remove them before you merge.
Aborting