ll-merge: use a longer conflict marker for internal merge