Retry merge folder rename if it doesn't work for the first time after one second.
Merge PR #1427 by @flo - fixes #1403 (save game crash)