All conflicts after we added packages are fixed