I did a hybrid approach - did reset to `HEAD~4` so the branch contained only the tag filter feature without any conflicts, then rebased it on top of master, and then re-wrote the last 4 patches manually - it was simpler than rebasing the whole branch.