watchdog: Fix merge 'conflict'