Fix busted merge