Resolve lag and correct odom msg
Resolve conflic
put back the tf refresh
Updated version.