Fix merge conflicts with develop, fix `_htp` related warning

[grandizzy]

Description

Fix _htp shadowed declaration warning. Fix merge develop

Purpose

Impact

Tasks

• [ ] Changes to protocol contracts are covered by unit tests executed by CI.
• [ ] Protocol contract size limits have not been exceeded.
• [ ] Gas consumption for impacted transactions have been compared with the target branch, and nontrivial changes cited in the Impact section above.
• [ ] Scope labels have been assigned as appropriate.
• [ ] Invariant tests have been manually executed as appropriate for the nature of the change.