Conflicts: admin/settings/settings-tax-rates.php
Rather than merging them (they are all different) I've refactered code and added multiple accounts in BACS which has had multiple requests.