Fixes watchdog to use nested merge blocks