Commit to allow pull.
Fixes merge conflict.
Adds potions on a 30s interval timer.