a little more merge conflict resolution before bed
PsyPets-specific meta