group conflict fixed