Experienced view
conflicts solving