r9375: fix conflicted merge