Code merged