Again fix indexHiddenFiles bug after merge
Cleanup after merge