Autovm update error

Hello,

I am getting this error when trying to update

root@ubuntu:~/autovm# git pull
Updating 680bef4…d1aea52
error: Your local changes to the following files would be overwritten by merge:
migration/m200128_070835_drop_server_license_column.php
Please commit your changes or stash them before you merge.
Aborting
root@ubuntu:~/autovm# Your local changes to the following files would be overwritten by merge:git stash drop^C
root@ubuntu:~/autovm# git stash drop
No stash entries found.
root@ubuntu:~/autovm# git pull
Updating 680bef4…d1aea52
error: Your local changes to the following files would be overwritten by merge:
migration/m200128_070835_drop_server_license_column.php
Please commit your changes or stash them before you merge.
Aborting
root@ubuntu:~/autovm# php7.2 yii migrate --migrationPath=@app/migration
PHP Warning: require(/root/autovm/config/db.php): failed to open stream: No such file or directory in /root/autovm/config/console.php on line 6
PHP Fatal error: require(): Failed opening required ‘/root/autovm/config/db.php’ (include_path=’.:/usr/share/php’) in /root/autovm/config/console.php on line 6

Run the below command
git stash
And then
git pull

root@ubuntu:/var/www/autovm# git pull
Updating 6d9b10c…d1aea52
error: Your local changes to the following files would be overwritten by merge:
migration/m200128_070835_drop_server_license_column.php
Please commit your changes or stash them before you merge.
Aborting
root@ubuntu:/var/www/autovm# php7.2 yii migrate --migrationPath=@app/migration
Yii Migration Tool (based on Yii v2.0.33-dev)

No new migrations found. Your system is up-to-date.

Did you run the git stash command at first ?

Sorry:

root@ubuntu:/var/www/autovm# git stash
Saved working directory and index state WIP on master: 6d9b10c Add sleep after e ach command
root@ubuntu:/var/www/autovm# git stash
No local changes to save
root@ubuntu:/var/www/autovm# git pull
remote: Enumerating objects: 28, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 16 (delta 10), reused 15 (delta 9), pack-reused 0
Unpacking objects: 100% (16/16), done.
From https://github.com/autovmnet/autovm
d1aea52…cea9b9a master -> origin/master
Updating 6d9b10c…cea9b9a
Fast-forward
…/m200128_070835_drop_server_license_column.php | 0
migrations/m200131_081908_drop_console_column.php | 42 +++++++++++++
models/Os.php | 13 ++±
models/Server.php | 7 ±-
modules/admin/controllers/VpsController.php | 4 ±
modules/admin/models/forms/SettingForm.php | 4 ±
modules/admin/views/default/setting.php | 3 -
modules/admin/views/server/create.php | 5 ±
modules/admin/views/server/edit.php | 1 -
modules/candy/python/install.py | 69 ++++++++++++++++++++±
modules/site/controllers/VpsController.php | 5 ±
11 files changed, 129 insertions(+), 24 deletions(-)
rename {migration => migrations}/m200128_070835_drop_server_license_column.php (100%)
create mode 100755 migrations/m200131_081908_drop_console_column.php
root@ubuntu:/var/www/autovm# php7.2 yii migrate --migrationPath=@app/migration
Yii Migration Tool (based on Yii v2.0.33-dev)

No new migrations found. Your system is up-to-date.

Run the below command
php7.2 yii migrate