Merge with HEAD, close aly's branch.