Fixed(?) health not updating
fixed conflicts