Create HUD
Fix merge conflict