conflicts evolution
