updating dotfiles
updaing config
merge resolve conflict