update ppatch
add presentations
fix conflict