Fixed email duplicate bug
Fixed merge conflit