Conflicted documents missing attachments

Add attachments to documents given to conflict resolvers
Semi-colon shouldn't be here.