Merged
requested to merge github/fork/farouksouei/revert-46847-fix-conflict-problems into fix-conflict-problems
Created by: farouksouei
Reverts firstcontributions/first-contributions#46847
Created by: farouksouei
Reverts firstcontributions/first-contributions#46847