update dotfiles & fix remove merge signs