fetching https://github.com/maxhaton/dmd.git tookAddressRefactor (attempt: 1/3) From https://github.com/maxhaton/dmd * branch tookAddressRefactor -> FETCH_HEAD merging FETCH_HEAD Auto-merging compiler/src/dmd/statementsem.d Auto-merging compiler/src/dmd/func.d CONFLICT (content): Merge conflict in compiler/src/dmd/func.d Auto-merging compiler/src/dmd/expressionsem.d Auto-merging compiler/src/dmd/escape.d CONFLICT (content): Merge conflict in compiler/src/dmd/escape.d Auto-merging compiler/src/dmd/dsymbolsem.d Auto-merging compiler/src/dmd/dcast.d Automatic merge failed; fix conflicts and then commit the result.