check yii-box
merge
fix merge
clean box