merging coflicts
merging
changing buy_now modal