Added animation for the main character

Added animation for the main character
Figuring out how to solve the conflict

Conflict solving