- merged code