fix composer after rebase.
fix omnipay version.