fix merge-conflict
fix merge-conflict

sdgdsffdsfff/galaxy,fxsjy/galaxy,fxsjy/galaxy,fxsjy/galaxy,ontologyzsy/galaxy,imotai/galaxy,Kai-Zhang/galaxy,bluebore/galaxy,taotaowill/galaxy,fxsjy/galaxy,ontologyzsy/galaxy,szxw/galaxy,bluebore/galaxy,sdgdsffdsfff/galaxy,WangCrystal/galaxy,szxw/galaxy,ontologyzsy/galaxy,ontologyzsy/galaxy,imotai/galaxy,szxw/galaxy,baidu/galaxy,WangCrystal/galaxy,Kai-Zhang/galaxy,fxsjy/galaxy,sdgdsffdsfff/galaxy,ontologyzsy/galaxy,bluebore/galaxy,May2016/galaxy,fxsjy/galaxy,imotai/galaxy,taotaowill/galaxy,sdgdsffdsfff/galaxy,Kai-Zhang/galaxy,bluebore/galaxy,May2016/galaxy,WangCrystal/galaxy,taotaowill/galaxy,sdgdsffdsfff/galaxy,May2016/galaxy,baidu/galaxy,imotai/galaxy,imotai/galaxy,szxw/galaxy,baidu/galaxy,fxsjy/galaxy,bluebore/galaxy,szxw/galaxy