update conflict errors
dev