merge with option branch