# Conflicts: # Content/Blueprints/BP_DefaultPlayerCharacter.uasset # Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset # Content/Character/Allium/BP_Allium.uasset # Content/Character/Lb/BP_Lb.uasset # Content/Character/Lb/BaseArrow.uasset # Content/Character/Riana/BP_Riana.uasset # Content/Maps/DevMap.umap # Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp # Source/Promether/PlayerGeneric/DefaultPlayerController.cpp