Conflicts were resolved.