changed conflict exception

as suggested by @cdent