correct graphical view
correct conflict