wait... now we're merged?