Some more merge stuff.