added controller
merge