Fixed up watchdog. Still doesn't work
Merge conflict resolution

YEAH