Toneklone,

Did you resolve this issue? If so how? I am having the same problem and I did merge the files. I'm pretty sure the issue is with the file: admin/includes/functions/general.php

But you have to restore all the original ZC files that were modified or overwritten before the white screen returns to normal. I checked my site each time I uploaded a merged file and the one stated above was what sent my site to a white screen. Just restoring that file didn't fix it though.

If anyone else could help it would be much appreciated. Thank you.