Anyone can help me how to resolve these conflicts？
warning: you may want to set your merge.renamelimit variable to at least 4538 and retry the command.
UnrealEd/Public/UnrealEd.h
CONFLICT (modify/delete): Engine/Shaders/MaterialTemplate.usf deleted in HEAD and modified in WaveWorks-4.16. Version WaveWorks-4.16 of Engine/Shaders/MaterialTemplate.usf left in tree.
CONFLICT (modify/delete): Engine/Shaders/LocalVertexFactory.usf deleted in HEAD and modified in WaveWorks-4.16. Version WaveWorks-4.16 of Engine/Shaders/LocalVertexFactory.usf left in tree.
CONFLICT (modify/delete): Engine/Shaders/Definitions.usf deleted in HEAD and modified in WaveWorks-4.16. Version WaveWorks-4.16 of Engine/Shaders/Definitions.usf left in tree.
Automatic merge failed; fix conflicts and then commit the result.