fix merge conflicts
Merge branch 'master' of https://github.com/atommclain/dot-files