added username & email
merged w origin