PR for [UX] Fixed merge conflict related issues from previous PR#1077#1199

Open

jamelachahbar wants to merge 2 commits intofeatures/uxfrom jachahbar-ux/fixmerges

+2,388-10,637

Commits on Dec 9, 2024

fixed merge, by removing Merge conflict markers encountered + other errors related to the merge fixed
jamelachahbar
committed

Commits on Dec 22, 2024

Merge branch 'features/ux' into jachahbar-ux/fixmerges
jamelachahbar
authored