Resolved sign up conflict
Merged latest master