Dead animation fixed
merged conflicts