user schema
user method
merge conflic
user auth login working
resolved merge conflics b/w login and dev