Billing info creation added
Conflicts fixed