conflicts resolve