Change fork for string version of year
Merge conflict