Github didn't detect conflicts here, however, since the float handling functions were moved into the Common namespace, this would cause a build failure.