Fixed merge issues and bug from presentation