updated libraries, use ConflictManager.strict