making merge work