changes
js
fix merge
adding primary/secondary price persistance