removed console.logs and updated controller
resolved conflicts