fix easter algorithm
merge