fixed Year bug and empty row bug
merging