doh, wrong side of the merge