Unable to git pull: file deleted in ff4e1bf (Latest ec2 instance list.) and modified in HEAD. Version HEAD of file left in tree

Question

I tried to delete a file in my git repo, and now I can\'t do a git pull anymore.

The file I\'m trying to delete is: aws_scripts/source_files/aws_accounts_list/