add ipsy
fix conflict