add concurrent editing fixes
add concurrent editing fixes