Conflicts: lexical-bind.el