fixed merge conflict
Merge pull request #185 from ministryofjustice/front-end/password

Front end/password