Don't merge the whole branch — just cherry-pick the specific commits you need and apply them to your branch.