update keynote
solve conflict