hpbar
resolve conflict