added some exceptions for conflicts