parties table corrected
confilict fixed