- Leftovers from the merge caused a build failure by trying to delete an unused...