added party feature
fixed merge