Canari

Hello there! I'm at the end of the merging section on Lexy's LOTD Special Edition Consistency Patches Merged and been having this conflict: https://imgur.com/Q2a1vEf Could you explain to me whats this conflict all about? I've redone the entire Loot Metadata instructions in both the main and merge guides but I still couldn't solve it for the life of me...