works on the js delete method
resolves merge conflicts