implementing edit conflict & collision detection

Benjamin Mako Hill || Want to submit a patch?