poor merge fix.