Merge with incremental sync