decoupled code
merge resolution