Fixed the Health Packs and Fixed Conflict Error