Fix merge breakage