updated party page
fixed merge c's