conclicts resolved