resolve conflict
memory