fetching https://github.com/radcapricorn/druntime.git typeInfoToStringQualifiers (attempt: 1/3)
From https://github.com/radcapricorn/druntime
 * branch            typeInfoToStringQualifiers -> FETCH_HEAD

merging FETCH_HEAD
CONFLICT (modify/delete): src/rt/typeinfo/ti_wchar.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_wchar.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_void.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_void.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_ushort.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_ushort.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_ulong.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_ulong.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_uint.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_uint.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_ubyte.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_ubyte.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_short.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_short.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_real.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_real.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_n.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_n.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_long.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_long.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_ireal.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_ireal.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_int.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_int.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_ifloat.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_ifloat.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_idouble.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_idouble.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_float.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_float.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_double.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_double.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_dchar.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_dchar.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_creal.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_creal.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_char.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_char.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_cfloat.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_cfloat.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_cdouble.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_cdouble.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_byte.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_byte.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Ashort.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Ashort.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Areal.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Areal.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Along.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Along.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Aint.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Aint.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Ag.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Ag.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Afloat.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Afloat.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Adouble.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Adouble.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Acreal.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Acreal.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Acfloat.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Acfloat.d left in tree.
CONFLICT (modify/delete): src/rt/typeinfo/ti_Acdouble.d deleted in HEAD and modified in 5cb96c6d929c6a54f391bac634f3c0616ec12dc5. Version 5cb96c6d929c6a54f391bac634f3c0616ec12dc5 of src/rt/typeinfo/ti_Acdouble.d left in tree.
Auto-merging old/src/object.d
CONFLICT (content): Merge conflict in old/src/object.d
Automatic merge failed; fix conflicts and then commit the result.