git conflict - file deleted in HEAD and modified in revision

If you now do git status, its output contains:

# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)

If you git rm them, a needs merge warning will be output but nevertheless the removal will succeed, then you can commit the modifications - this will be the "merge commit".

SO at this point do you have the file in the working copy that you pulled to?

if so just delete it and recommit.