epic merge / more restructuring for flexible companions