lavr: x86: merge some branches