changed base conflicts