fix previous incorrect merge