merge
add create controller & view