Included Message.id check for conflicting Message.id