added end to products controller
fixed merge conflict