Update schedule of events.
Fix merge conflict in test.foo