Pull request ElementsProject/lightning#6444

pay: Fix a non-rebased PR merge error

Range Diff Matrix