More merge work.