Fix merge conflicts in DwollaSdk.scala