Last of merge work