Add title and theme to Matz talk
Fix conflict