sign up fix
merging fix