store with conflicts resolution