added conditional to init.el
fixed merge conflict
added package.el file for emacs 23