Merge conflict in reader.rb