resolve
resolve conflict