should have a working merge at this point