Code

simplify output of conflicting merge