Bring back the fix: The duration of an existing effect will not be reduced by...

Bring back the fix: The duration of an existing effect will not be reduced by setting a new effect with a shorter duration (controlled by on_merge for some  effects). This means that an effect will not be removed if you save against another application of the same effect.
This was not functioning due to a careless code removal.