Corrected failed merge