Introduce ConflictError exception

Not raised anywhere yet.