new dotfiles commit
merge fix