Conflicts: .config/herbstluftwm/autostart .emacs.d/init.el .xinitrc .zprofile Makefile xmonad/xmonad.hs
Since it's no longer placed directly in the home directory it doesn't need to be named exacly the same.
