Add merge policy and implement sync updates