resolve conflict completely