UI and attack
Fix merge