The message says that you deleted a file in your current branch and someone else modified it in the branch you are pulling. You need to decide what to do with the file.
If you want to keep the file
$ git checkout <filename>
$ git add <filename>
$ git commit
If you want to discard the file
$ git rm <filename>
$ git commit
If the file was moved, you need to copy the changes over to the new location.