make merge work