fix changelog + merge conflict

Author: schaumb

CHANGELOG.md

@@ -22,8 +22,8 @@
 
 ### Added
 
-- Separate Channel properties to AxisChannel properties at config.
-- Move split align sort and reverse to AxisChannel
+- Separate AxisChannel properties from Channel properties at config.
+- Move split align sort and reverse from config to AxisChannel config.
 - Add new sorting strategy: 'byLabel'.
 - Enable split and align on mainAxis.
 

src/chart/generator/plotbuilder.cpp

@@ -187,7 +187,7 @@ std::vector<PlotBuilder::BucketSortInfo> PlotBuilder::sortedBuckets(
 		break;
 	case Sort::byLabel:
 		std::ranges::stable_sort(sorted,
-		    [](const BucketInfo &lhs, const BucketInfo &rhs)
+		    [](const BucketSortInfo &lhs, const BucketSortInfo &rhs)
 		    {
 			    if (rhs.label == nullptr || lhs.label == nullptr)
 				    return lhs.label != nullptr;