Fixed AdcController merge issue