Conflicts are not actually implemented yet