Conflicted documents missing attachments

Add attachments to documents given to conflict resolvers
Error should always be the last argument.