Add diverged branch support