fetching https://github.com/ljmf00/dmd.git add-type-aggregate (attempt: 1/3)
From https://github.com/ljmf00/dmd
 * branch                  add-type-aggregate -> FETCH_HEAD

merging FETCH_HEAD
Auto-merging compiler/src/dmd/visitor.h
Auto-merging compiler/src/dmd/tocsym.d
Auto-merging compiler/src/dmd/strictvisitor.d
Auto-merging compiler/src/dmd/semantic3.d
Auto-merging compiler/src/dmd/parsetimevisitor.d
Auto-merging compiler/src/dmd/opover.d
CONFLICT (content): Merge conflict in compiler/src/dmd/opover.d
Auto-merging compiler/src/dmd/mtype.h
CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.h
Auto-merging compiler/src/dmd/mtype.d
CONFLICT (content): Merge conflict in compiler/src/dmd/mtype.d
Auto-merging compiler/src/dmd/lambdacomp.d
Auto-merging compiler/src/dmd/frontend.h
CONFLICT (content): Merge conflict in compiler/src/dmd/frontend.h
Auto-merging compiler/src/dmd/expression.d
Auto-merging compiler/src/dmd/dtoh.d
Auto-merging compiler/src/dmd/dsymbolsem.d
CONFLICT (content): Merge conflict in compiler/src/dmd/dsymbolsem.d
Auto-merging compiler/src/dmd/dmangle.d
Auto-merging compiler/src/dmd/astbase.d
Automatic merge failed; fix conflicts and then commit the result.