When my coworker has to do the merge I be like

Things like this and wanting to be a considerate developer make me love rebasing before someone has the final merge.

It doesn't eliminate all conflicts between branches getting merged for a release but at least my branch is up to date with the base they are all merging into.