commit-x
commit-y
Merge branch 'branch-1'

Conflicts:
	SiteGenesis_Core/cartridge/forms/default/billing.xml