Changed coflict style for git merge.
Merge branch 'master' of https://github.com/stefanistrate/dotfiles