lel
conflicts fix + anim V2.1