email can be received
fix merge errors
pull & merge