Fixed merge conflicts

fixed issues with pacman draw after a ghost is eaten