Updating 0f8a90e..4fd1f52 error: Your local changes to the following files would be overwritten by merge: app/Traits/Migration/sample/migration_config/migration_config.sample.ini Please, commit your changes or stash them before you can merge. Aborting