Prevent with() and override() from being triggered twice on merge

Prevent with() and override() from being triggered twice on merge #529