Conflicts resolve