handled conflicts