fixed merge issues
localization and odo correction working, but not in all lightings