latest from my work laptop
Fixed conflict with init.el