Fix merge conflict relating to form field updates in BTCardFormViewController.
Fix merge conflict relating to form field updates in BTCardFormViewController.

Feverup/braintree_ios,apascual/braintree_ios,braintree/braintree_ios,billCTG/braintree_ios,apascual/braintree_ios,billCTG/braintree_ios,Feverup/braintree_ios,billCTG/braintree_ios,Feverup/braintree_ios,apascual/braintree_ios,apascual/braintree_ios,braintree/braintree_ios,braintree/braintree_ios,billCTG/braintree_ios,braintree/braintree_ios,billCTG/braintree_ios,Feverup/braintree_ios