adding time-triggered  prompts
resolving merge conflicts