Modify conflicted document with attachment test to include attachments present test