Trying to merge...
Trying to merge...
Merging is possible
Merge branch 'master' of https://github.com/veotos/dotfiles