apply: resolve trivial merge without hitting ll-merge with "--3way"