fixed conflict

index123 = production, index = new banner test