Resolve merge conflicts

Removes code added in merge conflict in https://github.com/spree-contrib/spree_tax_cloud/commit/378f60e526c3ab6be89d1f24e33b06bdda78747e