Fix conflict

Some kinda name collision over @email, at a guess. Fix it.
Merge branch 'develop-fftf'