conflict resoulved