Corrected code merge