Retry merge folder rename if it doesn't work for the first time after one second.

@Josharias  reported that this is indeed fixing the crash issue he was having.