merge fixes, death state working with attacks