presentation preparation
fix conflict