group work
group merge fixes