fix email
merged remote