dumb mistake with merge