old way
Merge branch 'master' into reset-password
finish password reset