Controller updated
Fixed merge conflict