merge phptal  to ci