Reviewed PR and linked issue.
Resolved merge conflict and applied adjustments.
Ran tests and confirmed success.
Committed changes and merged to main.
Pushed changes, closed PR, and cleaned up branch.
