fix conflict upstream