Fix merge issues

Update license year

Merge commit

(0) -100 -30 -10 -3 +3 tip

mercurial