Resolve merge conflicts dev main #323

Closed rhernandez-intertech closed 7 months ago