sign in functionality
conflict resolved