OR logic for conflicting User Permission DocTypes, fixes in file manager and user_to_str with moment.js