Give the app its proper name
Remove merge conflict output
Merge branch 'master' of github.com:alphagov/supplier-submission-portal