Merge with ChaosCore