How to squash commits that contain merge commits without re-resolving conflicts?

Question

I\'ve been working on a long running branch and I\'ve been pulling another branch (develop) into my branch every so often. I\'ve also been making small WIP (Work in Progress