add p and ..
add
up
fix conflict