Faulty merge fix