fix controller view
delete hoge
confrict merge view