fix conflicts
fix conflicts

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