fixed merge issue and set config command to CONFIG