Changed Battle to User, to Battle to Party
fixed conlficts