merge dev and t_branch (dev->t_branch)