Pacifier zombie (fixed merge conflicts)