Marcuses code merge