sign in and sign up working
ressolving conflits