small merge fix.