modified payment setup
deleted billingCtrl
added the billing ctrl back
pulled latest
added back the billing ctrl after pulling