On the other hand, if master has 3 commits changing the area and your branch has 1... It evens out.

In any case, I'd prefer to solve several smaller merge/rebase conflicts rather than one large one.