added controller
added controller
resolved merge conflict