fixed changing of year
merge