Added animation
Added animation + fixed merge