fixed init.el conflicts