@fengjingchao I think it's better to have one conflictNotFound definition