Reschedual Brian's talk
Fix merge conflict