First of all welcome! This is a great place for information so I'm sure you find help here.
And yes, smart move returning the oscars until your tank is cycled properly. As for conditioner...you do need to add this initially when you fill your tank with tap water. After that you just need to add conditioner when you do a water change for the amount of NEW tap water you put into the tank. Also salt is not needed either so you can skip putting that in there.
Feel free to ask questions...everyone here can help you get your tank cycled so you can care for oscars properly.
Also what size tank do you have and what filters do you have on it?