chart conflict resolved