change keyword config
delete keyword setting
fix conflict when pull from master