add p2
fix conflict