store2
resolve conflict