Paypal Express + GoogleCheckout Conflict HELP!

Hey guys,

After spending god knows how much time getting google checkout implemented I wanted to keep the option of using paypal Express checkout as well. Well...i did the new June17th patch or whatever and now google checkout doesnt show on my page. It shows in my modules, but not in my checkout.
Is there a way i can have both? or do i have to choose?

Thanks in advance!

I think i just fixed it,

I FTP'ed over the google checkout tpl_shopping_cart_default and replaced it with the one from Paypal Express....

At the moment both payment options seem to work properly (Link to appropriate payment page) and both Icons (Google Checkout Button & paypal checkout Button) appear in the shopping cart section.

Byah!