RE: Properly handling of concurrency conflicts