Adding diff3 style merge notations