checking for conflicts is now optional