Resolve lag and correct odom msg
Resolve conflic