fix groups merge