fixing the merge in the init.el file