simplify output of conflicting merge