Project directories names users corrupting repository

I keep having a problem with the EAP Selina builds getting a corrupt repository - Occasionally this will get cleared as its states by a restart but sometimes it can take a few attempts.

The visible side effect (and maybe internal cause) is that one or more of the directories in the project called users will then be displayed in the Project view as Users. I'm running on mac os so the actual name to the filesystem will not be any different.

Currently the only way to properly clear this is to re-name the directory outside of intelliJ (eg users-bad), synchronize files rename the directoy back to users and again synchronize. This seems to keep things happy until a random amount of time later, usually triggered by a Goto Class or Goto File lookup.