Fixed conflicts. Removed last changes of @Yulbraynner since his changes were doing nothing, suprime those changes and fixed merge conflicts
Fixed conflicts. Removed last changes of @Yulbraynner since his changes were doing nothing, suprime those changes and fixed merge conflicts

ssoulless/emailchecker,ssoulless/emailchecker