Fix more of my bad merging cause I'm dumb
Merge branch 'master' of https://github.com/cadyyan/dotfiles