local vs nonlocal merge in progress
local vs nonlocal merge in progress