Perform following steps to resolve git status "Unmerged paths:"
# if the file in the right place isn't already committed:
git add
# remove the "both deleted" file from the index:
git rm --cached ../public/images/originals/dog.ai
# commit th ...