Merge seems to work again.