Added odometry
Merge conflict RESOLVED