Error in conflict management on merge and commit on the same item

When 2 users "merge and commit" the same feature just one after the other, it breaks the local repo of the second user making it impossible for him to access to project.

2 users on the same branch (master for instance) with commit and save and merge on commit activated.

• User A goes to doc type definition of File
• User B goes to the same doc type definition
• User A changes the description of the doc type.
• User A merge and commit
• User B also changes the description of the same doc type (doesn't that someone else changed the same contrib).
• Merge and commit

-> No confirmation pop up for user B, and it's impossible for user B to access anything (see screenshot)