merge: fix numerus bugs around "trivial merge" area