Remove merge conflict, make users sign in