Conflicts resolved