merge conflict fix
more merge
fixed character animations AGAIN