Username conflicts might work now.

I think this might fix username conflicts, it might be buggy though.