Add animated text dialog
Merge the HUD conflict