concurrency conflicts are now fixed