add simultaneous editing conflict feature