some merge work