fetching https://github.com/MoonlightSentinel/dmd.git ci/dshell_use_host (attempt: 1/3)
From https://github.com/MoonlightSentinel/dmd
 * branch                  ci/dshell_use_host -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (file location): test/tools/dshell_prebuilt/dshell_prebuilt.d renamed to test/tools/dshell_prebuilt.d in 66bcbf812df0ef0bdca7dcc1f1251dc67cca465b, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/tools/dshell_prebuilt.d.
CONFLICT (rename/rename): Rename "test/tools/dshell_prebuilt/dshell_prebuilt.d"->"compiler/test/tools/dshell_prebuilt/dshell_prebuilt.d" in branch "HEAD" rename "test/tools/dshell_prebuilt/dshell_prebuilt.d"->"compiler/test/tools/dshell_prebuilt.d" in "66bcbf812df0ef0bdca7dcc1f1251dc67cca465b"
Auto-merging compiler/test/tools/dshell_prebuilt/dshell_prebuilt.d and compiler/test/tools/dshell_prebuilt.d, both renamed from test/tools/dshell_prebuilt/dshell_prebuilt.d
Auto-merging compiler/test/tools/d_do_test.d
Auto-merging compiler/test/run.d
Automatic merge failed; fix conflicts and then commit the result.