cleanup after Git's 3-way merger
cleanup after Git's 3-way merger

yangf4/core,YetAnotherMinion/core,YetAnotherMinion/core,yangf4/core,yangf4/core,yangf4/core,YetAnotherMinion/core,YetAnotherMinion/core,YetAnotherMinion/core,yangf4/core