Fix conflicts caused by `MappingsMerger`#1171

modmuss50 merged 3 commits intoFabricMC:exp/1.8FabricMC/fabric-loom:exp/1.8from

SpaceWalkerRS:fix-completed-mappingsSpaceWalkerRS/fabric-loom:fix-completed-mappingsCopy head branch name to clipboard