more layers and layer groups
fixing merge