attempt to fix concurrency bugs take 1
resolved merge conflict