group update fix...fuckau world
merge conflict fix