Fix merge conflicts

[sdankel]

Description

Checklist

• I have linked to any relevant issues.
• I have commented my code, particularly in hard-to-understand areas.
• I have updated the documentation where relevant (API docs, the reference, and the Sway book).
  • If my change requires substantial documentation changes, I have requested support from the DevRel team
• I have added tests that prove my fix is effective or that my feature works.
• I have added (or requested a maintainer to add) the necessary Breaking* or New Feature labels where relevant.
• I have done my best to ensure that my PR adheres to the Fuel Labs Code Review Standards.
• I have requested a review from the relevant team or maintainers.

[github-actions]

Benchmark for 3bd5812

Click to view benchmark

Test	Base	PR	%
code_action	5.0±0.10ms	5.1±0.37ms	+2.00%
code_lens	336.8±3.76ns	332.9±11.00ns	-1.16%
compile	2.6±0.05s	2.6±0.03s	0.00%
completion	4.5±0.03ms	4.5±0.01ms	0.00%
did_change_with_caching	2.6±0.05s	2.6±0.05s	0.00%
document_symbol	940.3±33.98µs	911.7±55.31µs	-3.04%
format	69.1±0.92ms	69.1±0.89ms	0.00%
goto_definition	343.1±2.30µs	347.9±8.32µs	+1.40%
highlight	8.6±0.12ms	8.6±0.14ms	0.00%
hover	500.8±15.84µs	498.6±7.97µs	-0.44%
idents_at_position	119.3±0.31µs	120.4±0.50µs	+0.92%
inlay_hints	628.4±12.72µs	639.8±35.69µs	+1.81%
on_enter	456.2±17.95ns	470.3±9.98ns	+3.09%
parent_decl_at_position	3.6±0.11ms	3.6±0.11ms	0.00%
prepare_rename	342.3±8.15µs	341.9±7.59µs	-0.12%
rename	8.9±0.13ms	8.9±0.06ms	0.00%
semantic_tokens	1213.9±9.58µs	1258.8±14.36µs	+3.70%
token_at_position	336.5±3.01µs	339.8±2.50µs	+0.98%
tokens_at_position	3.6±0.05ms	3.6±0.08ms	0.00%
tokens_for_file	401.6±3.91µs	403.6±6.20µs	+0.50%
traverse	37.9±1.06ms	37.9±1.30ms	0.00%