little merge fix