Fixing merging my-plugins.el