Resolve merge conflict.
Merge branch 'master' of https://github.com/daemianmack/dotfiles
Remove merge conflict header.