static layout for checkout page
fix conflicts