Modifications for conflict handling including conflicts on removeDocument().