Fix merge miss
Fix merge miss

chainer/chainer,kikusu/chainer,kiyukuta/chainer,aonotas/chainer,keisuke-umezawa/chainer,hvy/chainer,1986ks/chainer,niboshi/chainer,truongdq/chainer,cupy/cupy,anaruse/chainer,muupan/chainer,cupy/cupy,sinhrks/chainer,ktnyt/chainer,ttakamura/chainer,chainer/chainer,tkerola/chainer,okuta/chainer,ytoyama/yans_chainer_hackathon,nushio3/chainer,cemoody/chainer,bayerj/chainer,ikasumi/chainer,delta2323/chainer,jnishi/chainer,laysakura/chainer,ronekko/chainer,AlpacaDB/chainer,umitanuki/chainer,jnishi/chainer,tigerneil/chainer,kuwa32/chainer,pfnet/chainer,okuta/chainer,sou81821/chainer,niboshi/chainer,woodshop/complex-chainer,chainer/chainer,jfsantos/chainer,wkentaro/chainer,wkentaro/chainer,sinhrks/chainer,cupy/cupy,benob/chainer,wkentaro/chainer,niboshi/chainer,chainer/chainer,wkentaro/chainer,t-abe/chainer,hidenori-t/chainer,benob/chainer,cupy/cupy,kikusu/chainer,jnishi/chainer,hvy/chainer,rezoo/chainer,elviswf/chainer,ktnyt/chainer,Kaisuke5/chainer,wavelets/chainer,nushio3/chainer,okuta/chainer,okuta/chainer,niboshi/chainer,keisuke-umezawa/chainer,tereka114/chainer,jnishi/chainer,yanweifu/chainer,woodshop/chainer,hvy/chainer,t-abe/chainer,tscohen/chainer,truongdq/chainer,muupan/chainer,ysekky/chainer,minhpqn/chainer,keisuke-umezawa/chainer,keisuke-umezawa/chainer,AlpacaDB/chainer,ttakamura/chainer,masia02/chainer,kashif/chainer,ktnyt/chainer,ktnyt/chainer,hvy/chainer