added local init.el changes."
fixed merge conflict.