fixing conflicts
fixed init.el conflicts
cleanup