Properly handling of concurrency conflicts