fix doc update conflict errors