Pricing Table page
Fixed conflicts