added some 'conflicts'