I merged in the wrong direction before

Le sigh