More merge work