fix conflict
fix conflict

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