whole conflict resolved