# Conflicts: # src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java # update.md
# Conflicts: # src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java # src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java
Merge pull request #732 from alibaba/2.1.x