changed vote count position
fixed conflicts