Added 'docs_conflicted' state field. Tiny fixes, close #50