update enable/disable checker feature
fix conflicts