Currently you are asked if you want to merge Folders, and if you say no then you lose what you typed.
There's been some discussion in the past of how to handle folders that collide in terms of providing more options (merge, rename out the target one etc) but in terms of this matter I think that when you abort the action (currently No to merging) it should return to your editing the folder name with what you typed so you can adjust it further, rather than lose what you typed. I'm hoping this is a minor tweak
d