Corrected faulty merge