Reslove issue with CanShowIndexView test in BidAdministrationControllerTest
Resolve merge conflict after pull