Added structure for points system and collision method for pickupitems
Fixed conflict and corrected errors