Update; handling "disagreed" documents
Update: cancel out
Merge remote-tracking branch 'origin/master'