hopefully resolved one of the merge errors

Author: ElaineShu0312

csm_web/scheduler/views/user.py

@@ -128,7 +128,7 @@ def user_update(request, pk):
     serializer = UserSerializer(user, data=request.data, partial=True)
     if serializer.is_valid():
         serializer.save()
-        return Response(serializer.data, status=status.HTTP_201_CREATED)
+        return Response(serializer.data, status=status.HTTP_200_OK)
     return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)