Conflicted documents missing attachments

Add attachments to documents given to conflict resolvers
Fix the alignment.