password implemented
resolved conflict