Rohan | Fixed sign in issue
solve conflict