----
-----
conflict resolved and fixed groups