Some time ago I made a mistake by merging a feature branch into the master branch (should have been develop). I noticed this just after the merge and did a reset on the master branch. This removed about 10 files from the master branch.
Meanwhile I branched a new feature branch from develop and worked on this branch (also on the files deleted from master) and merged it back into develop. 

Today I merged the develop branch into master for a new release. Unfortunately all files that were removed during the reset are missing in the master branch, new files that were added later are present. 

I would like to merge the develop branch into master so that after the merge the master branch has the same files as the develop branch. How can I do this?

I've tried rebasing the develop branch with the master branch but that only resulted in the files to be removed from the develop branch as wel. I've been able to roll this back