try resolve conflict