Resolve conflict with upstream & update next events/contact info