finally fixed animation transistions and moved rigidbody physics to fixedupdate function
fixed merge conflict