Changes to Reader.java
Reader.java merge conflict resolution