add resolve conflict