merge groups big conflict