fetching https://github.com/nordlow/dmd.git cat-iconv (attempt: 1/3)
From https://github.com/nordlow/dmd
 * branch                  cat-iconv  -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (implicit dir rename): Cannot map more than one path to compiler/test/fail_compilation/traits_hasAliasing.d; implicit directory renames tried to put these paths there: test/compilable/traits_hasAliasing.d, test/fail_compilation/traits_hasAliasing.d
CONFLICT (modify/delete): src/dmd/dcast.d deleted in HEAD and modified in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059. Version b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 of src/dmd/dcast.d left in tree.
CONFLICT (file location): test/fail_compilation/impconv_array.d added in b883d6f9f0b0ef54c0b401c0a22b562aa55ac059 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to compiler/test/fail_compilation/impconv_array.d.
Auto-merging compiler/src/dmd/traits.d
CONFLICT (content): Merge conflict in compiler/src/dmd/traits.d
Auto-merging compiler/src/dmd/mtype.d
CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/id.d
Auto-merging compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/dsymbol.d
CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbol.d
Automatic merge failed; fix conflicts and then commit the result.