merge change for yiitemplate