HUD, added
Conflict fixed, hopefully
Fixing conflicts