commented merge