Tiny merge fix