Messaging Report + Document Update Conflict fixes