If use email is the same, we assume it is the same user.
Merge branch 'develop'