Conflicts updated