RVT: bad merge conflict choice