after i delete conflicting files, the merge doesn't realise files in source branch to merge

Question

I try to merge master to my branch but there are some conflicts. I delete the conflicting files in my branch and try to merge again but it says "Already up to date.&quo