merge .emacs and .emacs.d/init.el then remove .emacs