fix missmerge
quincydcm: regenerate defconfigs