Fix for issue #237: clearing changed fields recursively in EmbeddedDocuments after saving a Document
Fixing conflict