Fixed a merge bug - two controller methods with same name.