Fixed merging years with magic