fix bugs regarding branching content