fix conflict
Merge branch 'master' of github.com:D-Programming-Language/installer