Conflicts resolution