Minn, ditch the conditioner.

As long as your using TAP water fill up your container and mix your salt up, let it stand for a day before using, preferably with a small power head stirring it, no worries about chlorine. If I am not mistaken, salt water actually neutralizes chlorine and chloramine, but I could be WAY off on that, better to let Gary on one of the other chemistry guys comment on that.