Pre-presentation update
Fix merge conflicts