Conflicts solving