routes and animations added
conflicts solve