delete needless lines from init.el
solve conflict