Conflicts resolved?