merge main.el into init-local.el