I need help with git

I removed a file from all of git history today and now my deployment to another server is failing.

What do I need to do?

My deployment script calls "git pull origin master"

When I attempt to deploy I get the following ...

RETINA> envoy run deploy --env=staging
[me@myserver.com]: Application is now in maintenance mode.
[me@myserver.com]: M    app/Http/Controllers/AircraftTypesController.php
M   app/Http/Controllers/BindingsController.php
M   app/Http/routes.php
M   app/Models/Aircraft.php
A   features/admin/Components/classes/list.feature
A   features/admin/Components/types/list.feature
A   features/admin/aircraft/concrete/list.feature
A   features/admin/aircraft/types/bindings.feature
A   features/admin/aircraft/types/list.feature
A   features/admin/aircraft/types/view.feature
U   features/bootstrap/AdminContext.php
U   features/bootstrap/Traits/Admin/Accounts.php
A   features/bootstrap/Traits/Admin/Aircraft.php
A   features/bootstrap/Traits/Admin/AircraftTypes.php
A   features/bootstrap/Traits/Admin/ComponentClasses.php
A   features/bootstrap/Traits/Admin/ComponentTypes.php
M   resources/views/aircraft/concrete/partials/sidebar.blade.php
U   resources/views/aircraft/types/index.blade.php
A   resources/views/aircraft/types/list.blade.php
M   resources/views/aircraft/types/partials/sidebar.blade.php
U   resources/views/components/classes/partials/sidebar.blade.php
U   resources/views/components/types/partials/list.blade.php
U   resources/views/components/types/partials/sidebar.blade.php
M   resources/views/layouts/partials/content.blade.php
M   resources/views/layouts/partials/sidebar.blade.php
U   resources/views/maintenance/quote/request/partials/list.blade.php
M   storage/app/.gitignore
M   storage/framework/cache/.gitignore
M   storage/framework/sessions/.gitignore
[me@myserver.com]: Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution and make a commit.
[me@myserver.com]: /usr/bin:/bin:/usr/sbin:/sbin
/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
[me@myserver.com]: Loading composer repositories with package information
[me@myserver.com]: Installing dependencies (including require-dev) from lock file
[me@myserver.com]: Nothing to install or update
[me@myserver.com]: Generating autoload files
[me@myserver.com]: > php artisan clear-compiled
[me@myserver.com]: > php artisan optimize
[me@myserver.com]: Generating optimized class loader
[me@myserver.com]: Generating optimized autoload files
[me@myserver.com]: Nothing to migrate.
[me@myserver.com]: Generating optimized class loader
[me@myserver.com]: Application is now live.
[me@myserver.com]: Deployment to STAGING complete.