Fixing merge breakage