Adding character movement
Resolve conflicts