Fix what merge broke