PetSchool: Resolved merge conflict