some grouping done
some grouping done and merge conflict