Fixed some more merge bugs. Added a check for null targets for the bouncy ball