merge changes for yiitemplate