added snooze command line
fixed merge conflicts