merge, resolve conflict