add group member
conflict fix