Small merge fix