merge changes for yii template