Added merge strategy to en PastTime and Weekday rules#20

LeonB wants to merge 2 commits intoolebedev:masterolebedev/when:masterfrom

omniboost:masteromniboost/when:masterCopy head branch name to clipboard