Description of problem:
In 6.1.0 ER3, the functionality of the conflict dialog was fixed. Unfortunately, 6.1.0 ER4 does not show the conflict dialog any more. There is no issue which require its removing.

My opinion is that the commit [1] which fixed bz 1159238 brokes this functionality. Can you investigate it?

[1] https://github.com/droolsjbpm/jbpm-designer/commit/be97a9034

Version-Release number of selected component (if applicable):
6.1.0 ER4

Steps to Reproduce:
1. Open two browsers window
2. Login as 'user1' in the first window
3. Login as 'user2' in the second window
4. user1: create BP 'test'
5. user1: create process 'Start -> Task -> End'
6. user1: save process
7. user1: transfor Task to Manual Task and save a process
8. user2: Open BP 'test'
9. user2: delete End event and create this process 'Start -> Manual Task -> Task2 -> End'
10. user2: save
11: user1: transform End event to Termination End event
12: user1: save

Actual results:
No Conflict Dialog is displayed. user1 rewritten user2's work. The version history allows to restore it.

Expected results:
The conflict dialog is displayed which says that 'user2' modified 'process location'. Options are "Force Save", "Reopen".

Additional info:
Issues which was fixed in 6.1.0 ER3:

• bz 1111406
• bz 1140695