shibuay, ebisu add
baba & ebisu merging