rm some untracked files and modified .gitconfig