add hurtview, change recharge bar
remove conflie, refactor code