change email
resolve merge
Merge branch 'working'