signin with google+ working now
conflict resolved