css merge fix