Re: Properly handling of concurrency conflicts