merge resolution
reverting setImmediate for deltas - performance is horrible