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...