Adding merged code