merge complit
local - server complete data